[svn-r16489] Fixed bug #1459 by eliminating the macro long_long and replacing all instances with long long.

Tested:
   h5comittest
   fedora 10 x64
   Vista 32, VS2005, IVF101
   XP32, Cygwin
   

11 files changed, 106 insertions, 106 deletions

diff --git a/tools/h5diff/h5diffgentest.c b/tools/h5diff/h5diffgentest.c
index 141c96f..d9495e5 100644
--- a/tools/h5diff/h5diffgentest.c
+++ b/tools/h5diff/h5diffgentest.c
@@ -43,7 +43,7 @@
 #define FILE11   "h5diff_empty.h5"
 #define UIMAX    4294967295u /*Maximum value for a variable of type unsigned int */
 #define STR_SIZE 3
-#define GBLL    ((unsigned long_long) 1024 * 1024 *1024 )
+#define GBLL    ((unsigned long long) 1024 * 1024 *1024 )
 
 
 #define MY_LINKCLASS 187
@@ -202,12 +202,12 @@ int test_basic(const char *fname1, const char *fname2, const char *fname3)
     
     /*-------------------------------------------------------------------------
     * relative error, compare divide by zero, both zero
-    * # 1.6.2 with -p (unsigned long_long)
+    * # 1.6.2 with -p (unsigned long long)
     *-------------------------------------------------------------------------
     */
     {
-        unsigned long_long data7[3][2] = {{100,100},{100,0},{0,100}};
-        unsigned long_long data8[3][2] = {{120,80}, {0,100},{0,50}};
+        unsigned long long data7[3][2] = {{100,100},{100,0},{0,100}};
+        unsigned long long data8[3][2] = {{120,80}, {0,100},{0,50}};
         
         write_dset(gid1,2,dims2,"dset7",H5T_NATIVE_ULLONG,data7);
         write_dset(gid1,2,dims2,"dset8",H5T_NATIVE_ULLONG,data8);
@@ -575,11 +575,11 @@ int test_datatypes(const char *fname)
     char          buf7a[3][2] = {{-1,-128},{-1,-1},{-1,-1}};
     unsigned char buf7b[3][2] = {{1,128},{1,1},{1,1}};
     
-    /* long_long test */
-    long_long            buf8a[3][2] = {{1,1},{1,1},{1,1}};
-    long_long            buf8b[3][2] = {{1,1},{3,4},{5,6}};
-    unsigned long_long   buf9a[3][2] = {{1,1},{1,1},{1,1}};
-    unsigned long_long   buf9b[3][2] = {{1,1},{3,4},{5,6}};
+    /* long long test */
+    long long            buf8a[3][2] = {{1,1},{1,1},{1,1}};
+    long long            buf8b[3][2] = {{1,1},{3,4},{5,6}};
+    unsigned long long   buf9a[3][2] = {{1,1},{1,1},{1,1}};
+    unsigned long long   buf9b[3][2] = {{1,1},{3,4},{5,6}};
     
     unsigned int    buf10a[3][2] = {{UIMAX,1},{1,1},{1,1}};
     unsigned int    buf10b[3][2] = {{UIMAX-1,1},{3,4},{5,6}};
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);
diff --git a/tools/h5dump/h5dumpgentest.c b/tools/h5dump/h5dumpgentest.c
index 05efda8..3b11eac 100644
--- a/tools/h5dump/h5dumpgentest.c
+++ b/tools/h5dump/h5dumpgentest.c
@@ -5608,7 +5608,7 @@ gent_binary(void)
  *
  *-------------------------------------------------------------------------
  */
-#define GB4LL    ((unsigned long_long) 4*1024*1024*1024)
+#define GB4LL    ((unsigned long long) 4*1024*1024*1024)
 #define DIM_4GB  (GB4LL + 10)
 
 static void
diff --git a/tools/h5import/h5import.h b/tools/h5import/h5import.h
index 975ace0..c43b0cf 100755
--- a/tools/h5import/h5import.h
+++ b/tools/h5import/h5import.h
@@ -68,7 +68,7 @@
 #define H5DT_UINT8     unsigned char
 #define H5DT_UINT16    unsigned short
 #define H5DT_UINT32    unsigned int
-#define H5DT_INT64     long_long
+#define H5DT_INT64     long long
 #define H5DT_UINT64    unsigned H5DT_INT64
 
 struct path_info
diff --git a/tools/h5import/h5importtest.c b/tools/h5import/h5importtest.c
index 0b0ba9c..718ec6b 100755
--- a/tools/h5import/h5importtest.c
+++ b/tools/h5import/h5importtest.c
@@ -44,10 +44,10 @@ main(void)
     int       rowi4i = (int)1 , coli4i = (int)2 , plni4i = (int)5 ;
 
 #ifndef WIN32
-    long_long b64i2[3][4], b64i3[5][3][4];
-    long_long row4i64[3], col4i64[4], pln4i64[5];
-    long_long rowo4i64 = (long_long)11 , colo4i64 = (long_long)21 , plno4i64 = (long_long)51 ;
-    long_long rowi4i64 = (long_long)1 , coli4i64 = (long_long)2 , plni4i64 = (long_long)5 ;
+    long long b64i2[3][4], b64i3[5][3][4];
+    long long row4i64[3], col4i64[4], pln4i64[5];
+    long long rowo4i64 = (long long)11 , colo4i64 = (long long)21 , plno4i64 = (long long)51 ;
+    long long rowi4i64 = (long long)1 , coli4i64 = (long long)2 , plni4i64 = (long long)5 ;
 #endif
 
     short     b16i3[5][3][4];
diff --git a/tools/h5ls/h5ls.c b/tools/h5ls/h5ls.c
index 0c492d0..ca0ddcb 100644
--- a/tools/h5ls/h5ls.c
+++ b/tools/h5ls/h5ls.c
@@ -770,11 +770,11 @@ display_enum_type(hid_t type, int ind)
 
     /* Determine what data type 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;
         } else {
@@ -813,13 +813,13 @@ display_enum_type(hid_t type, int ind)
  	     *strangely, unless use another pointer "copy".*/
  	    copy = value+i*dst_size;
             HDfprintf(stdout,"%"H5_PRINTF_LL_WIDTH"u",
-            *((unsigned long_long*)((void*)copy)));
+            *((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)));
         }
     }
 
diff --git a/tools/h5repack/h5repacktst.c b/tools/h5repack/h5repacktst.c
index d10bc25..c5f9d69 100644
--- a/tools/h5repack/h5repacktst.c
+++ b/tools/h5repack/h5repacktst.c
@@ -92,7 +92,7 @@ int d_status = EXIT_SUCCESS;
 #define CDIM1   DIM1/2
 #define CDIM2   DIM2/2
 #define RANK    2
-#define GBLL    ((unsigned long_long) 1024*1024*1024)
+#define GBLL    ((unsigned long long) 1024*1024*1024)
 
 /* Size of userblock (for userblock test) */
 #define USERBLOCK_SIZE  2048
diff --git a/tools/lib/h5diff_array.c b/tools/lib/h5diff_array.c
index f9c6261..5d57a52 100644
--- a/tools/lib/h5diff_array.c
+++ b/tools/lib/h5diff_array.c
@@ -138,7 +138,7 @@ static int   not_comparable;
  */
 static hsize_t diff_region(hid_t obj1_id, hid_t obj2_id,hid_t region1_id, hid_t region2_id, diff_opt_t *options);
 static hbool_t all_zero(const void *_mem, size_t size);
-static int     ull2float(unsigned long_long ull_value, float *f_value);
+static int     ull2float(unsigned long long ull_value, float *f_value);
 static hsize_t character_compare(unsigned char *mem1,unsigned char *mem2,hsize_t i,unsigned u,int rank,hsize_t *dims,hsize_t *acc,hsize_t *pos,diff_opt_t *options,const char *obj1,const char *obj2,int *ph);
 static hsize_t character_compare_opt(unsigned char *mem1,unsigned char *mem2,hsize_t i,int rank,hsize_t *dims,hsize_t *acc,hsize_t *pos,diff_opt_t *options,const char *obj1,const char *obj2,int *ph);
 static hbool_t equal_float(float value, float expected, diff_opt_t *options);
@@ -356,9 +356,9 @@ hsize_t diff_array( void *_mem1,
  * H5T_COMPOUND
  *  Recursively call this function for each member
  * H5T_ARRAY
- *  Recursively call this function for each element 
+ *  Recursively call this function for each element�
  * H5T_VLEN
- *  Recursively call this function for each element 
+ *  Recursively call this function for each element�
  * H5T_STRING
  *  compare byte by byte in a cycle from 0 to type_size. this type_size is the
  *  value obtained by the get_size function but it is the string lenght for
@@ -1588,12 +1588,12 @@ hsize_t diff_datum(void       *_mem1,
 
         else if (H5Tequal(m_type, H5T_NATIVE_LLONG))
         {
-            long_long        temp1_llong;
-            long_long        temp2_llong;
-            assert(type_size==sizeof(long_long));
+            long long        temp1_llong;
+            long long        temp2_llong;
+            assert(type_size==sizeof(long long));
 
-            memcpy(&temp1_llong, mem1, sizeof(long_long));
-            memcpy(&temp2_llong, mem2, sizeof(long_long));
+            memcpy(&temp1_llong, mem1, sizeof(long long));
+            memcpy(&temp2_llong, mem2, sizeof(long long));
             /* -d and !-p */
             if (options->d && !options->p)
             {
@@ -1686,16 +1686,16 @@ hsize_t diff_datum(void       *_mem1,
 
         else if (H5Tequal(m_type, H5T_NATIVE_ULLONG))
         {
-            unsigned long_long        temp1_ullong;
-            unsigned long_long        temp2_ullong;
-            assert(type_size==sizeof(unsigned long_long));
+            unsigned long long        temp1_ullong;
+            unsigned long long        temp2_ullong;
+            assert(type_size==sizeof(unsigned long long));
 
-            memcpy(&temp1_ullong, mem1, sizeof(unsigned long_long));
-            memcpy(&temp2_ullong, mem2, sizeof(unsigned long_long));
+            memcpy(&temp1_ullong, mem1, sizeof(unsigned long long));
+            memcpy(&temp2_ullong, mem2, sizeof(unsigned long long));
             /* -d and !-p */
             if (options->d && !options->p)
             {
-                if ( PDIFF(temp1_ullong,temp2_ullong) > (unsigned long_long)options->delta)
+                if ( PDIFF(temp1_ullong,temp2_ullong) > (unsigned long long)options->delta)
                 {
                     if ( print_data(options) )
                     {
@@ -1758,7 +1758,7 @@ hsize_t diff_datum(void       *_mem1,
 
                 else
 
-                    if ( per > options->percent && PDIFF(temp1_ullong,temp2_ullong) > (unsigned long_long)options->delta )
+                    if ( per > options->percent && PDIFF(temp1_ullong,temp2_ullong) > (unsigned long long)options->delta )
                     {
 
                         if ( print_data(options) )
@@ -4777,8 +4777,8 @@ hsize_t diff_llong(unsigned char *mem1,
 
 {
  hsize_t       nfound=0;          /* number of differences found */
- long_long     temp1_llong;
- long_long     temp2_llong;
+ long long     temp1_llong;
+ long long     temp2_llong;
  hsize_t       i;
  double        per;
  int           both_zero;
@@ -4789,8 +4789,8 @@ hsize_t diff_llong(unsigned char *mem1,
 
      for ( i = 0; i < nelmts; i++)
      {
-         memcpy(&temp1_llong, mem1, sizeof(long_long));
-         memcpy(&temp2_llong, mem2, sizeof(long_long));
+         memcpy(&temp1_llong, mem1, sizeof(long long));
+         memcpy(&temp2_llong, mem2, sizeof(long long));
 
          if (ABS( temp1_llong-temp2_llong) > options->delta)
          {
@@ -4802,8 +4802,8 @@ hsize_t diff_llong(unsigned char *mem1,
              }
              nfound++;
          }
-         mem1+=sizeof(long_long);
-         mem2+=sizeof(long_long);
+         mem1+=sizeof(long long);
+         mem2+=sizeof(long long);
          if (options->n && nfound>=options->count)
              return nfound;
      }
@@ -4816,8 +4816,8 @@ hsize_t diff_llong(unsigned char *mem1,
 
      for ( i = 0; i < nelmts; i++)
      {
-         memcpy(&temp1_llong, mem1, sizeof(long_long));
-         memcpy(&temp2_llong, mem2, sizeof(long_long));
+         memcpy(&temp1_llong, mem1, sizeof(long long));
+         memcpy(&temp2_llong, mem2, sizeof(long long));
 
          PER(temp1_llong,temp2_llong);
 
@@ -4844,8 +4844,8 @@ hsize_t diff_llong(unsigned char *mem1,
                  }
                  nfound++;
              }
-             mem1+=sizeof(long_long);
-             mem2+=sizeof(long_long);
+             mem1+=sizeof(long long);
+             mem2+=sizeof(long long);
              if (options->n && nfound>=options->count)
                  return nfound;
      }
@@ -4859,8 +4859,8 @@ hsize_t diff_llong(unsigned char *mem1,
 
      for ( i = 0; i < nelmts; i++)
      {
-         memcpy(&temp1_llong, mem1, sizeof(long_long));
-         memcpy(&temp2_llong, mem2, sizeof(long_long));
+         memcpy(&temp1_llong, mem1, sizeof(long long));
+         memcpy(&temp2_llong, mem2, sizeof(long long));
 
          PER(temp1_llong,temp2_llong);
 
@@ -4887,8 +4887,8 @@ hsize_t diff_llong(unsigned char *mem1,
                  }
                  nfound++;
              }
-             mem1+=sizeof(long_long);
-             mem2+=sizeof(long_long);
+             mem1+=sizeof(long long);
+             mem2+=sizeof(long long);
              if (options->n && nfound>=options->count)
                  return nfound;
      }
@@ -4899,8 +4899,8 @@ hsize_t diff_llong(unsigned char *mem1,
 
      for ( i = 0; i < nelmts; i++)
      {
-         memcpy(&temp1_llong, mem1, sizeof(long_long));
-         memcpy(&temp2_llong, mem2, sizeof(long_long));
+         memcpy(&temp1_llong, mem1, sizeof(long long));
+         memcpy(&temp2_llong, mem2, sizeof(long long));
 
          if (temp1_llong != temp2_llong)
          {
@@ -4913,8 +4913,8 @@ hsize_t diff_llong(unsigned char *mem1,
              nfound++;
          }
 
-         mem1+=sizeof(long_long);
-         mem2+=sizeof(long_long);
+         mem1+=sizeof(long long);
+         mem2+=sizeof(long long);
          if (options->n && nfound>=options->count)
              return nfound;
      } /* nelmts */
@@ -4950,8 +4950,8 @@ hsize_t diff_ullong(unsigned char *mem1,
 
 {
  hsize_t             nfound=0;          /* number of differences found */
- unsigned long_long  temp1_ullong;
- unsigned long_long  temp2_ullong;
+ unsigned long long  temp1_ullong;
+ unsigned long long  temp2_ullong;
  hsize_t             i;
  float               f1, f2;
  double              per;
@@ -4963,10 +4963,10 @@ hsize_t diff_ullong(unsigned char *mem1,
 
      for ( i = 0; i < nelmts; i++)
      {
-         memcpy(&temp1_ullong, mem1, sizeof(unsigned long_long));
-         memcpy(&temp2_ullong, mem2, sizeof(unsigned long_long));
+         memcpy(&temp1_ullong, mem1, sizeof(unsigned long long));
+         memcpy(&temp2_ullong, mem2, sizeof(unsigned long long));
 
-         if ( PDIFF(temp1_ullong,temp2_ullong) > (unsigned long_long) options->delta)
+         if ( PDIFF(temp1_ullong,temp2_ullong) > (unsigned long long) options->delta)
          {
              if ( print_data(options) )
              {
@@ -4976,8 +4976,8 @@ hsize_t diff_ullong(unsigned char *mem1,
              }
              nfound++;
          }
-         mem1+=sizeof(unsigned long_long);
-         mem2+=sizeof(unsigned long_long);
+         mem1+=sizeof(unsigned long long);
+         mem2+=sizeof(unsigned long long);
          if (options->n && nfound>=options->count)
              return nfound;
      }
@@ -4990,8 +4990,8 @@ hsize_t diff_ullong(unsigned char *mem1,
 
      for ( i = 0; i < nelmts; i++)
      {
-         memcpy(&temp1_ullong, mem1, sizeof(unsigned long_long));
-         memcpy(&temp2_ullong, mem2, sizeof(unsigned long_long));
+         memcpy(&temp1_ullong, mem1, sizeof(unsigned long long));
+         memcpy(&temp2_ullong, mem2, sizeof(unsigned long long));
 
          ull2float(temp1_ullong,&f1);
          ull2float(temp2_ullong,&f2);
@@ -5020,8 +5020,8 @@ hsize_t diff_ullong(unsigned char *mem1,
                  }
                  nfound++;
              }
-             mem1+=sizeof(unsigned long_long);
-             mem2+=sizeof(unsigned long_long);
+             mem1+=sizeof(unsigned long long);
+             mem2+=sizeof(unsigned long long);
              if (options->n && nfound>=options->count)
                  return nfound;
      }
@@ -5035,8 +5035,8 @@ hsize_t diff_ullong(unsigned char *mem1,
 
      for ( i = 0; i < nelmts; i++)
      {
-         memcpy(&temp1_ullong, mem1, sizeof(unsigned long_long));
-         memcpy(&temp2_ullong, mem2, sizeof(unsigned long_long));
+         memcpy(&temp1_ullong, mem1, sizeof(unsigned long long));
+         memcpy(&temp2_ullong, mem2, sizeof(unsigned long long));
 
          ull2float(temp1_ullong,&f1);
          ull2float(temp2_ullong,&f2);
@@ -5055,7 +5055,7 @@ hsize_t diff_ullong(unsigned char *mem1,
 
          else
 
-             if ( per > options->percent && PDIFF(temp1_ullong,temp2_ullong) > (unsigned long_long)options->delta )
+             if ( per > options->percent && PDIFF(temp1_ullong,temp2_ullong) > (unsigned long long)options->delta )
              {
                  if ( print_data(options) )
                  {
@@ -5065,8 +5065,8 @@ hsize_t diff_ullong(unsigned char *mem1,
                  }
                  nfound++;
              }
-             mem1+=sizeof(unsigned long_long);
-             mem2+=sizeof(unsigned long_long);
+             mem1+=sizeof(unsigned long long);
+             mem2+=sizeof(unsigned long long);
              if (options->n && nfound>=options->count)
                  return nfound;
      }
@@ -5077,8 +5077,8 @@ hsize_t diff_ullong(unsigned char *mem1,
 
      for ( i = 0; i < nelmts; i++)
      {
-         memcpy(&temp1_ullong, mem1, sizeof(unsigned long_long));
-         memcpy(&temp2_ullong, mem2, sizeof(unsigned long_long));
+         memcpy(&temp1_ullong, mem1, sizeof(unsigned long long));
+         memcpy(&temp2_ullong, mem2, sizeof(unsigned long long));
 
          if (temp1_ullong != temp2_ullong)
          {
@@ -5091,8 +5091,8 @@ hsize_t diff_ullong(unsigned char *mem1,
              nfound++;
          }
 
-         mem1+=sizeof(unsigned long_long);
-         mem2+=sizeof(unsigned long_long);
+         mem1+=sizeof(unsigned long long);
+         mem2+=sizeof(unsigned long long);
          if (options->n && nfound>=options->count)
              return nfound;
      } /* nelmts */
@@ -5107,7 +5107,7 @@ hsize_t diff_ullong(unsigned char *mem1,
 /*-------------------------------------------------------------------------
  * Function:    ull2float
  *
- * Purpose:     convert unsigned long_long to float
+ * Purpose:     convert unsigned long long to float
  *
  * Programmer:  pvn
  *              Mar 22, 2006
@@ -5117,7 +5117,7 @@ hsize_t diff_ullong(unsigned char *mem1,
  *-------------------------------------------------------------------------
  */
 static
-int ull2float(unsigned long_long ull_value, float *f_value)
+int ull2float(unsigned long long ull_value, float *f_value)
 {
  hid_t          dxpl_id;
  unsigned char  *buf;
@@ -5573,7 +5573,7 @@ void print_pos( int        *ph,       /* print header */
         parallel_print("[ " );
         for ( i = 0; i < rank; i++)
         {
-            parallel_print(HSIZE_T_FORMAT, (unsigned long_long)pos[i]);
+            parallel_print(HSIZE_T_FORMAT, (unsigned long long)pos[i]);
             parallel_print(" ");
         }
         parallel_print("]" );
@@ -5651,7 +5651,7 @@ void print_char_pos( int        *ph,       /* print header */
         
         for ( i = 0; i < rank; i++)
         {
-            parallel_print(HSIZE_T_FORMAT, (unsigned long_long)pos[i]);
+            parallel_print(HSIZE_T_FORMAT, (unsigned long long)pos[i]);
             parallel_print(" ");
         }
         
diff --git a/tools/lib/h5diff_util.c b/tools/lib/h5diff_util.c
index 35f4dfb..1acc493 100644
--- a/tools/lib/h5diff_util.c
+++ b/tools/lib/h5diff_util.c
@@ -371,7 +371,7 @@ get_class(H5T_class_t tclass)
 void print_found(hsize_t nfound)
 {
  if(g_Parallel)
-  parallel_print("%"H5_PRINTF_LL_WIDTH"u differences found\n", (unsigned long_long)nfound);
+  parallel_print("%"H5_PRINTF_LL_WIDTH"u differences found\n", (unsigned long long)nfound);
  else
   HDfprintf(stdout,"%Hu differences found\n",nfound);
 }
diff --git a/tools/lib/h5tools.c b/tools/lib/h5tools.c
index 52d65fe..6032c02 100644
--- a/tools/lib/h5tools.c
+++ b/tools/lib/h5tools.c
@@ -1559,8 +1559,8 @@ int render_bin_output(FILE *stream, hid_t tid, void *_mem)
  size_t             size;   /* datum size */
  float              tempfloat;
  double             tempdouble;
- unsigned long_long tempullong;
- long_long          templlong;
+ unsigned long long tempullong;
+ long long          templlong;
  unsigned long      tempulong;
  long               templong;
  unsigned int       tempuint;
@@ -1726,7 +1726,7 @@ int render_bin_output(FILE *stream, hid_t tid, void *_mem)
  }
  else if (H5Tequal(tid, H5T_NATIVE_LLONG))
  {
-  memcpy(&templlong, mem, sizeof(long_long));
+  memcpy(&templlong, mem, sizeof(long long));
 #ifdef DEBUG_H5DUMP_BIN
   fprintf(stream, fmt_llong, templlong);
 #else
@@ -1736,7 +1736,7 @@ int render_bin_output(FILE *stream, hid_t tid, void *_mem)
  }
  else if (H5Tequal(tid, H5T_NATIVE_ULLONG))
  {
-  memcpy(&tempullong, mem, sizeof(unsigned long_long));
+  memcpy(&tempullong, mem, sizeof(unsigned long long));
 #ifdef DEBUG_H5DUMP_BIN
   fprintf(stream, fmt_ullong, tempullong);
 #else
@@ -1768,7 +1768,7 @@ int render_bin_output(FILE *stream, hid_t tid, void *_mem)
   }
   else
   {
-   memcpy(&templlong, mem, sizeof(long_long));
+   memcpy(&templlong, mem, sizeof(long long));
 #ifdef DEBUG_H5DUMP_BIN
    fprintf(stream, fmt_llong, templlong);
 #else
@@ -1801,7 +1801,7 @@ int render_bin_output(FILE *stream, hid_t tid, void *_mem)
   }
   else
   {
-   memcpy(&tempullong, mem, sizeof(unsigned long_long));
+   memcpy(&tempullong, mem, sizeof(unsigned long long));
 #ifdef DEBUG_H5DUMP_BIN
    fprintf(stream, fmt_ullong, tempullong);
 #else
diff --git a/tools/lib/h5tools_str.c b/tools/lib/h5tools_str.c
index 5d42307..a339acf 100644
--- a/tools/lib/h5tools_str.c
+++ b/tools/lib/h5tools_str.c
@@ -586,8 +586,8 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
      * some tempvars to store the value before we append it to the string to
      * get rid of the memory alignment problem
      */
-    unsigned long_long tempullong;
-    long_long          templlong;
+    unsigned long long tempullong;
+    long long          templlong;
     unsigned long      tempulong;
     long               templong;
     unsigned int       tempuint;
@@ -737,10 +737,10 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
         HDmemcpy(&tempulong, vp, sizeof(unsigned long));
         h5tools_str_append(str, OPT(info->fmt_ulong, "%lu"), tempulong);
     } else if (H5Tequal(type, H5T_NATIVE_LLONG)) {
-        HDmemcpy(&templlong, vp, sizeof(long_long));
+        HDmemcpy(&templlong, vp, sizeof(long long));
         h5tools_str_append(str, OPT(info->fmt_llong, fmt_llong), templlong);
     } else if (H5Tequal(type, H5T_NATIVE_ULLONG)) {
-        HDmemcpy(&tempullong, vp, sizeof(unsigned long_long));
+        HDmemcpy(&tempullong, vp, sizeof(unsigned long long));
         h5tools_str_append(str, OPT(info->fmt_ullong, fmt_ullong), tempullong);
     } else if (H5Tequal(type, H5T_NATIVE_HSSIZE)) {
         if (sizeof(hssize_t) == sizeof(int)) {
@@ -750,7 +750,7 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
             memcpy(&templong, vp, sizeof(long));
             h5tools_str_append(str, OPT(info->fmt_long, "%ld"), templong);
         } else {
-            memcpy(&templlong, vp, sizeof(long_long));
+            memcpy(&templlong, vp, sizeof(long long));
             h5tools_str_append(str, OPT(info->fmt_llong, fmt_llong), templlong);
         }
     } else if (H5Tequal(type, H5T_NATIVE_HSIZE)) {
@@ -761,7 +761,7 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
             memcpy(&tempulong, vp, sizeof(long));
             h5tools_str_append(str, OPT(info->fmt_ulong, "%lu"), tempulong);
         } else {
-            memcpy(&tempullong, vp, sizeof(unsigned long_long));
+            memcpy(&tempullong, vp, sizeof(unsigned long long));
             h5tools_str_append(str, OPT(info->fmt_ullong, fmt_ullong), tempullong);
         }
     } else if (H5Tget_class(type) == H5T_COMPOUND) {