[svn-r16514] Description:

	Merge r16440:16500 from trunk into revise_chunks branch.

Tested on:
        FreeBSD/32 6.3 (duty) in debug mode
        FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
        Linux/32 2.6 (jam) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
                                in debug mode
        Linux/64-amd64 2.6 (smirom) w/Intel compilers w/default API=1.6.x,
                                w/C++ & FORTRAN, in production mode
        Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
                                w/szip filter, in production mode
        Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
                                in production mode
        Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode
        Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
        Mac OS X/32 10.5.6 (amazon) in debug mode
        Mac OS X/32 10.5.6 (amazon) w/C++ & FORTRAN, w/threadsafe,
                                in production mode

1 files changed, 14 insertions, 14 deletions

diff --git a/tools/h5dump/h5dump.c b/tools/h5dump/h5dump.c
index 19a26b4..600de9b 100644
--- a/tools/h5dump/h5dump.c
+++ b/tools/h5dump/h5dump.c
@@ -3065,9 +3065,9 @@ dump_fcpl(hid_t fid)
     indentation(indent + COL);
     printf("%s %u\n","OBJECTHEADER_VERSION", shhdr);
     indentation(indent + COL);
-    HDfprintf(stdout,"%s %Hd\n","OFFSET_SIZE", (long_long)off_size);
+    HDfprintf(stdout,"%s %Hd\n","OFFSET_SIZE", (long long)off_size);
     indentation(indent + COL);
-    HDfprintf(stdout,"%s %Hd\n","LENGTH_SIZE", (long_long)len_size);
+    HDfprintf(stdout,"%s %Hd\n","LENGTH_SIZE", (long long)len_size);
     indentation(indent + COL);
     printf("%s %u\n","BTREE_RANK", sym_ik);
     indentation(indent + COL);
@@ -4505,12 +4505,12 @@ print_enum(hid_t type)
     /*
      * Determine what datatype to use for the native values.  To simplify
      * things we entertain three possibilities:
-     *  1. long_long -- the largest native signed integer
-     *    2. unsigned long_long -- the largest native unsigned integer
+     *  1. long long -- the largest native signed integer
+     *    2. unsigned long long -- the largest native unsigned integer
      *    3. raw format
      */
-    if (H5Tget_size(type) <= sizeof(long_long)) {
-    dst_size = sizeof(long_long);
+    if (H5Tget_size(type) <= sizeof(long long)) {
+    dst_size = sizeof(long long);
 
     if (H5T_SGN_NONE == H5Tget_sign(type)) {
         native = H5T_NATIVE_ULLONG;
@@ -4556,14 +4556,14 @@ print_enum(hid_t type)
         /*On SGI Altix(cobalt), wrong values were printed out with "value+i*dst_size"
          *strangely, unless use another pointer "copy".*/
         copy = value+i*dst_size;
-        HDfprintf(stdout,"%" H5_PRINTF_LL_WIDTH "u", *((unsigned long_long *)
+        HDfprintf(stdout,"%" H5_PRINTF_LL_WIDTH "u", *((unsigned long long *)
                           ((void *)copy)));
     } else {
         /*On SGI Altix(cobalt), wrong values were printed out with "value+i*dst_size"
          *strangely, unless use another pointer "copy".*/
         copy = value+i*dst_size;
         HDfprintf(stdout,"%" H5_PRINTF_LL_WIDTH "d",
-           *((long_long *) ((void *)copy)));
+           *((long long *) ((void *)copy)));
     }
 
     printf(";\n");
@@ -6684,12 +6684,12 @@ xml_print_enum(hid_t type)
     /*
      * Determine what datatype to use for the native values.  To simplify
      * things we entertain three possibilities:
-     *  1. long_long -- the largest native signed integer
-     *    2. unsigned long_long -- the largest native unsigned integer
+     *  1. long long -- the largest native signed integer
+     *    2. unsigned long long -- the largest native unsigned integer
      *    3. raw format
      */
-    if (H5Tget_size(type) <= sizeof(long_long)) {
-        dst_size = sizeof(long_long);
+    if (H5Tget_size(type) <= sizeof(long long)) {
+        dst_size = sizeof(long long);
 
         if (H5T_SGN_NONE == H5Tget_sign(type)) {
             native = H5T_NATIVE_ULLONG;
@@ -6737,11 +6737,11 @@ xml_print_enum(hid_t type)
             for (j = 0; j < dst_size; j++)
                 printf("%02x", value[i * dst_size + j]);
         } else if (H5T_SGN_NONE == H5Tget_sign(native)) {
-            HDfprintf(stdout,"%" H5_PRINTF_LL_WIDTH "u", *((unsigned long_long *)
+            HDfprintf(stdout,"%" H5_PRINTF_LL_WIDTH "u", *((unsigned long long *)
                               ((void *) (value + i * dst_size))));
         } else {
             HDfprintf(stdout,"%" H5_PRINTF_LL_WIDTH "d",
-               *((long_long *) ((void *) (value + i * dst_size))));
+               *((long long *) ((void *) (value + i * dst_size))));
         }
         printf("\n");
         indentation(indent);