[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
   

8 files changed, 160 insertions, 160 deletions

diff --git a/test/big.c b/test/big.c
index 3cef154..8176929 100644
--- a/test/big.c
+++ b/test/big.c
@@ -38,7 +38,7 @@ const char *FILENAME[] = {
 #define MAX_TRIES	100
 
 #if H5_SIZEOF_LONG_LONG >= 8
-#   define GB8LL	((unsigned long_long)8*1024*1024*1024)
+#   define GB8LL	((unsigned long long)8*1024*1024*1024)
 #else
 #   define GB8LL	0	/*cannot do the test*/
 #endif
@@ -53,7 +53,7 @@ static hsize_t values_used[WRT_N];
 /*-------------------------------------------------------------------------
  * Function:	randll
  *
- * Purpose:	Create a random long_long value.
+ * Purpose:	Create a random long long value.
  * 		Ensures that a write at this value doesn't overlap any
  *		previous write.
  *
@@ -577,8 +577,8 @@ HDfprintf(stderr, "Random # seed was: %lu\n", seed);
 	 * because we would generate multi-gigabyte files.
 	 */
 	puts("Checking if file system is adequate for this test...");
-	if (sizeof(long_long)<8 || 0==GB8LL) {
-	    puts("Test skipped because sizeof(long_long) is too small. This");
+	if (sizeof(long long)<8 || 0==GB8LL) {
+	    puts("Test skipped because sizeof(long long) is too small. This");
 	    puts("hardware apparently doesn't support 64-bit integer types.");
 	    usage();
 	    goto quit;
diff --git a/test/cmpd_dset.c b/test/cmpd_dset.c
index d1f317f..53c63d7 100644
--- a/test/cmpd_dset.c
+++ b/test/cmpd_dset.c
@@ -116,7 +116,7 @@ typedef struct {
     float f, g, h[16], i, j;
     double k, l, m, n;
     long o, p, q;
-    long_long r, s, t;
+    long long r, s, t;
 } stype4;
 
 #define NX	100u
diff --git a/test/dsets.c b/test/dsets.c
index a5257fe..3d1dfd3 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -2604,11 +2604,11 @@ test_nbit_int(hid_t file)
     if((dataset = H5Dcreate2(file, DSET_NBIT_INT_NAME, datatype,
                              space, H5P_DEFAULT, dc, H5P_DEFAULT)) < 0) goto error;
 
-    /* Initialize data, assuming size of long_long >= size of int */
+    /* Initialize data, assuming size of long long >= size of int */
     for(i= 0;i< (size_t)size[0]; i++)
       for(j = 0; j < (size_t)size[1]; j++) {
-        orig_data[i][j] = (int)(((long_long)HDrandom() %
-                           (long_long)HDpow(2.0, (double)(precision - 1))) << offset);
+        orig_data[i][j] = (int)(((long long)HDrandom() %
+                           (long long)HDpow(2.0, (double)(precision - 1))) << offset);
 
         /* even-numbered values are negtive */
         if((i*size[1]+j+1)%2 == 0)
@@ -2914,7 +2914,7 @@ test_nbit_double(hid_t file)
         goto error;
 
     /* Check that the values read are the same as the values written
-     * Assume size of long_long = size of double
+     * Assume size of long long = size of double
      */
     for(i=0; i<(size_t)size[0]; i++) {
         for(j=0; j<(size_t)size[1]; j++) {
@@ -3016,13 +3016,13 @@ test_nbit_array(hid_t file)
     if((dataset = H5Dcreate2(file, DSET_NBIT_ARRAY_NAME, array_datatype,
                              space, H5P_DEFAULT, dc, H5P_DEFAULT)) < 0) goto error;
 
-    /* Initialize data, assuming size of long_long >= size of unsigned int */
+    /* Initialize data, assuming size of long long >= size of unsigned int */
     for(i= 0;i< (size_t)size[0]; i++)
       for(j = 0; j < (size_t)size[1]; j++)
         for(m = 0; m < (size_t)adims[0]; m++)
           for(n = 0; n < (size_t)adims[1]; n++)
-            orig_data[i][j][m][n] = (unsigned int)(((long_long)HDrandom() %
-                                     (long_long)HDpow(2.0, (double)precision)) << offset);
+            orig_data[i][j][m][n] = (unsigned int)(((long long)HDrandom() %
+                                     (long long)HDpow(2.0, (double)precision)) << offset);
     PASSED();
 #else
     SKIPPED();
@@ -3198,15 +3198,15 @@ test_nbit_compound(hid_t file)
     if((dataset = H5Dcreate2(file, DSET_NBIT_COMPOUND_NAME, cmpd_tid,
                              space, H5P_DEFAULT, dc, H5P_DEFAULT)) < 0) goto error;
 
-    /* Initialize data, assuming size of long_long >= size of member datatypes */
+    /* Initialize data, assuming size of long long >= size of member datatypes */
     for(i= 0;i< (size_t)size[0]; i++)
       for(j = 0; j < (size_t)size[1]; j++) {
-        orig_data[i][j].i = (int)(((long_long)HDrandom() %
-                             (long_long)HDpow(2.0, (double)(precision[0]-1))) << offset[0]);
-        orig_data[i][j].c = (char)(((long_long)HDrandom() %
-                             (long_long)HDpow(2.0, (double)(precision[1]-1))) << offset[1]);
-        orig_data[i][j].s = (short)(((long_long)HDrandom() %
-                             (long_long)HDpow(2.0, (double)(precision[2]-1))) << offset[2]);
+        orig_data[i][j].i = (int)(((long long)HDrandom() %
+                             (long long)HDpow(2.0, (double)(precision[0]-1))) << offset[0]);
+        orig_data[i][j].c = (char)(((long long)HDrandom() %
+                             (long long)HDpow(2.0, (double)(precision[1]-1))) << offset[1]);
+        orig_data[i][j].s = (short)(((long long)HDrandom() %
+                             (long long)HDpow(2.0, (double)(precision[2]-1))) << offset[2]);
         orig_data[i][j].f = float_val[i][j];
 
         /* some even-numbered integer values are negtive */
@@ -3445,33 +3445,33 @@ test_nbit_compound_2(hid_t file)
     if((dataset = H5Dcreate2(file, DSET_NBIT_COMPOUND_NAME_2, cmpd_tid2,
                              space, H5P_DEFAULT, dc, H5P_DEFAULT)) < 0) goto error;
 
-    /* Initialize data, assuming size of long_long >= size of member datatypes */
+    /* Initialize data, assuming size of long long >= size of member datatypes */
     for(i= 0;i< (size_t)size[0]; i++)
       for(j = 0; j < (size_t)size[1]; j++) {
-        orig_data[i][j].a.i = (int)(((long_long)HDrandom() %
-                               (long_long)HDpow(2.0, (double)(precision[0]-1))) << offset[0]);
-        orig_data[i][j].a.c = (char)(((long_long)HDrandom() %
-                               (long_long)HDpow(2.0, (double)(precision[1]-1))) << offset[1]);
-        orig_data[i][j].a.s = (short)(-((long_long)HDrandom() %
-                               (long_long)HDpow(2.0, (double)(precision[2]-1))) << offset[2]);
+        orig_data[i][j].a.i = (int)(((long long)HDrandom() %
+                               (long long)HDpow(2.0, (double)(precision[0]-1))) << offset[0]);
+        orig_data[i][j].a.c = (char)(((long long)HDrandom() %
+                               (long long)HDpow(2.0, (double)(precision[1]-1))) << offset[1]);
+        orig_data[i][j].a.s = (short)(-((long long)HDrandom() %
+                               (long long)HDpow(2.0, (double)(precision[2]-1))) << offset[2]);
         orig_data[i][j].a.f = float_val[i][j];
 
-        orig_data[i][j].v = (unsigned int)(((long_long)HDrandom() %
-                             (long_long)HDpow(2.0, (double)precision[3])) << offset[3]);
+        orig_data[i][j].v = (unsigned int)(((long long)HDrandom() %
+                             (long long)HDpow(2.0, (double)precision[3])) << offset[3]);
 
         for(m = 0; m < (size_t)array_dims[0]; m++)
           for(n = 0; n < (size_t)array_dims[1]; n++)
-            orig_data[i][j].b[m][n] = (char)(((long_long)HDrandom() %
-                                       (long_long)HDpow(2.0, (double)(precision[4]-1))) << offset[4]);
+            orig_data[i][j].b[m][n] = (char)(((long long)HDrandom() %
+                                       (long long)HDpow(2.0, (double)(precision[4]-1))) << offset[4]);
 
         for(m = 0; m < (size_t)array_dims[0]; m++)
           for(n = 0; n < (size_t)array_dims[1]; n++) {
-            orig_data[i][j].d[m][n].i = (int)(-((long_long)HDrandom() %
-                                         (long_long)HDpow(2.0, (double)(precision[0]-1))) << offset[0]);
-            orig_data[i][j].d[m][n].c = (char)(((long_long)HDrandom() %
-                                         (long_long)HDpow(2.0, (double)(precision[1]-1))) << offset[1]);
-            orig_data[i][j].d[m][n].s = (short)(((long_long)HDrandom() %
-                                         (long_long)HDpow(2.0, (double)(precision[2]-1))) << offset[2]);
+            orig_data[i][j].d[m][n].i = (int)(-((long long)HDrandom() %
+                                         (long long)HDpow(2.0, (double)(precision[0]-1))) << offset[0]);
+            orig_data[i][j].d[m][n].c = (char)(((long long)HDrandom() %
+                                         (long long)HDpow(2.0, (double)(precision[1]-1))) << offset[1]);
+            orig_data[i][j].d[m][n].s = (short)(((long long)HDrandom() %
+                                         (long long)HDpow(2.0, (double)(precision[2]-1))) << offset[2]);
             orig_data[i][j].d[m][n].f = float_val[i][j];
           }
       }
diff --git a/test/dt_arith.c b/test/dt_arith.c
index 67885a3..e507fd0 100644
--- a/test/dt_arith.c
+++ b/test/dt_arith.c
@@ -1668,8 +1668,8 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
     unsigned		hw_uint;
     long		hw_long;
     unsigned long	hw_ulong;
-    long_long		hw_llong;
-    unsigned long_long	hw_ullong;
+    long long		hw_llong;
+    unsigned long long	hw_ullong;
 
     /* What are the names of the source and destination types */
     if (H5Tequal(src, H5T_NATIVE_SCHAR)) {
@@ -1766,7 +1766,7 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
     dst_nbits = H5Tget_precision(dst); /* not 8*dst_size, esp on J90 - QAK */
     src_sign = H5Tget_sign(src);
     dst_sign = H5Tget_sign(dst);
-    aligned = HDcalloc(1, sizeof(long_long));
+    aligned = HDcalloc(1, sizeof(long long));
 
     /* Allocate and initialize the source buffer through macro INIT_INTEGER.  The BUF
      * will be used for the conversion while the SAVED buffer will be
@@ -1789,9 +1789,9 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
     } else if(src_type == INT_ULONG) {
         INIT_INTEGER(unsigned long, ULONG_MAX, 0, src_size, dst_size, src_nbits, buf, saved, nelmts);
     } else if(src_type == INT_LLONG) {
-        INIT_INTEGER(long_long, LLONG_MAX, LLONG_MIN, src_size, dst_size, src_nbits, buf, saved, nelmts);
+        INIT_INTEGER(long long, LLONG_MAX, LLONG_MIN, src_size, dst_size, src_nbits, buf, saved, nelmts);
     } else if(src_type == INT_ULLONG) {
-        INIT_INTEGER(unsigned long_long, ULLONG_MAX, 0, src_size, dst_size, src_nbits, buf, saved, nelmts);
+        INIT_INTEGER(unsigned long long, ULLONG_MAX, 0, src_size, dst_size, src_nbits, buf, saved, nelmts);
     } else
         goto error;
 
@@ -1837,12 +1837,12 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
                 hw_char = (signed char)(*((unsigned long*)aligned));
                 break;
             case INT_LLONG:
-                HDmemcpy(aligned, saved+j*sizeof(long_long), sizeof(long_long));
-                hw_char = (signed char)(*((long_long*)aligned));
+                HDmemcpy(aligned, saved+j*sizeof(long long), sizeof(long long));
+                hw_char = (signed char)(*((long long*)aligned));
                 break;
             case INT_ULLONG:
-                HDmemcpy(aligned, saved+j*sizeof(unsigned long_long), sizeof(unsigned long_long));
-                hw_char = (signed char)(*((unsigned long_long*)aligned));
+                HDmemcpy(aligned, saved+j*sizeof(unsigned long long), sizeof(unsigned long long));
+                hw_char = (signed char)(*((unsigned long long*)aligned));
                 break;
             default:
                 break;
@@ -1883,12 +1883,12 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
                 hw_uchar = (unsigned char)(*((unsigned long*)aligned));
                 break;
             case INT_LLONG:
-                HDmemcpy(aligned, saved+j*sizeof(long_long), sizeof(long_long));
-                hw_uchar = (unsigned char)(*((long_long*)aligned));
+                HDmemcpy(aligned, saved+j*sizeof(long long), sizeof(long long));
+                hw_uchar = (unsigned char)(*((long long*)aligned));
                 break;
             case INT_ULLONG:
-                HDmemcpy(aligned, saved+j*sizeof(unsigned long_long), sizeof(unsigned long_long));
-                hw_uchar = (unsigned char)(*((unsigned long_long*)aligned));
+                HDmemcpy(aligned, saved+j*sizeof(unsigned long long), sizeof(unsigned long long));
+                hw_uchar = (unsigned char)(*((unsigned long long*)aligned));
                 break;
             default:
                 break;
@@ -1929,12 +1929,12 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
                 hw_short = (short)(*((unsigned long*)aligned));
                 break;
             case INT_LLONG:
-                HDmemcpy(aligned, saved+j*sizeof(long_long), sizeof(long_long));
-                hw_short = (short)(*((long_long*)aligned));
+                HDmemcpy(aligned, saved+j*sizeof(long long), sizeof(long long));
+                hw_short = (short)(*((long long*)aligned));
                 break;
             case INT_ULLONG:
-                HDmemcpy(aligned, saved+j*sizeof(unsigned long_long), sizeof(unsigned long_long));
-                hw_short = (short)(*((unsigned long_long*)aligned));
+                HDmemcpy(aligned, saved+j*sizeof(unsigned long long), sizeof(unsigned long long));
+                hw_short = (short)(*((unsigned long long*)aligned));
                 break;
 
             default:
@@ -1976,12 +1976,12 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
                 hw_ushort = (unsigned short)(*((unsigned long*)aligned));
                 break;
             case INT_LLONG:
-                HDmemcpy(aligned, saved+j*sizeof(long_long), sizeof(long_long));
-                hw_ushort = (unsigned short)(*((long_long*)aligned));
+                HDmemcpy(aligned, saved+j*sizeof(long long), sizeof(long long));
+                hw_ushort = (unsigned short)(*((long long*)aligned));
                 break;
             case INT_ULLONG:
-                HDmemcpy(aligned, saved+j*sizeof(unsigned long_long), sizeof(unsigned long_long));
-                hw_ushort = (unsigned short)(*((unsigned long_long*)aligned));
+                HDmemcpy(aligned, saved+j*sizeof(unsigned long long), sizeof(unsigned long long));
+                hw_ushort = (unsigned short)(*((unsigned long long*)aligned));
                 break;
             default:
                 break;
@@ -2022,12 +2022,12 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
                 hw_int = (int)(*((unsigned long*)aligned));
                 break;
             case INT_LLONG:
-                HDmemcpy(aligned, saved+j*sizeof(long_long), sizeof(long_long));
-                hw_int = (int)(*((long_long*)aligned));
+                HDmemcpy(aligned, saved+j*sizeof(long long), sizeof(long long));
+                hw_int = (int)(*((long long*)aligned));
                 break;
             case INT_ULLONG:
-                HDmemcpy(aligned, saved+j*sizeof(unsigned long_long), sizeof(unsigned long_long));
-                hw_int = (int)(*((unsigned long_long*)aligned));
+                HDmemcpy(aligned, saved+j*sizeof(unsigned long long), sizeof(unsigned long long));
+                hw_int = (int)(*((unsigned long long*)aligned));
                 break;
             default:
                 break;
@@ -2068,12 +2068,12 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
                 hw_uint = (unsigned int)(*((unsigned long*)aligned));
                 break;
             case INT_LLONG:
-                HDmemcpy(aligned, saved+j*sizeof(long_long), sizeof(long_long));
-                hw_uint = (unsigned int)(*((long_long*)aligned));
+                HDmemcpy(aligned, saved+j*sizeof(long long), sizeof(long long));
+                hw_uint = (unsigned int)(*((long long*)aligned));
                 break;
             case INT_ULLONG:
-                HDmemcpy(aligned, saved+j*sizeof(unsigned long_long), sizeof(unsigned long_long));
-                hw_uint = (unsigned int)(*((unsigned long_long*)aligned));
+                HDmemcpy(aligned, saved+j*sizeof(unsigned long long), sizeof(unsigned long long));
+                hw_uint = (unsigned int)(*((unsigned long long*)aligned));
                 break;
             default:
                 break;
@@ -2114,12 +2114,12 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
                 hw_long = (long int)(*((unsigned long*)aligned));
                 break;
             case INT_LLONG:
-                HDmemcpy(aligned, saved+j*sizeof(long_long), sizeof(long_long));
-                hw_long = (long int)(*((long_long*)aligned));
+                HDmemcpy(aligned, saved+j*sizeof(long long), sizeof(long long));
+                hw_long = (long int)(*((long long*)aligned));
                 break;
             case INT_ULLONG:
-                HDmemcpy(aligned, saved+j*sizeof(unsigned long_long), sizeof(unsigned long_long));
-                hw_long = (long int)(*((unsigned long_long*)aligned));
+                HDmemcpy(aligned, saved+j*sizeof(unsigned long long), sizeof(unsigned long long));
+                hw_long = (long int)(*((unsigned long long*)aligned));
                 break;
             default:
                 break;
@@ -2160,12 +2160,12 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
                 hw_ulong = (unsigned long)(*((unsigned long*)aligned));
                 break;
             case INT_LLONG:
-                HDmemcpy(aligned, saved+j*sizeof(long_long), sizeof(long_long));
-                hw_ulong = (unsigned long)(*((long_long*)aligned));
+                HDmemcpy(aligned, saved+j*sizeof(long long), sizeof(long long));
+                hw_ulong = (unsigned long)(*((long long*)aligned));
                 break;
             case INT_ULLONG:
-                HDmemcpy(aligned, saved+j*sizeof(unsigned long_long), sizeof(unsigned long_long));
-                hw_ulong = (unsigned long)(*((unsigned long_long*)aligned));
+                HDmemcpy(aligned, saved+j*sizeof(unsigned long long), sizeof(unsigned long long));
+                hw_ulong = (unsigned long)(*((unsigned long long*)aligned));
                 break;
             default:
                 break;
@@ -2175,43 +2175,43 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
             switch (src_type) {
             case INT_SCHAR:
                 HDmemcpy(aligned, saved+j*sizeof(char), sizeof(char));
-                hw_llong = (long_long)(*((char*)aligned));
+                hw_llong = (long long)(*((char*)aligned));
                 break;
             case INT_UCHAR:
                 HDmemcpy(aligned, saved+j*sizeof(unsigned char), sizeof(unsigned char));
-                hw_llong = (long_long)(*((unsigned char*)aligned));
+                hw_llong = (long long)(*((unsigned char*)aligned));
                 break;
             case INT_SHORT:
                 HDmemcpy(aligned, saved+j*sizeof(short), sizeof(short));
-                hw_llong = (long_long)(*((short*)aligned));
+                hw_llong = (long long)(*((short*)aligned));
                 break;
             case INT_USHORT:
                 HDmemcpy(aligned, saved+j*sizeof(unsigned short), sizeof(unsigned short));
-                hw_llong = (long_long)(*((unsigned short*)aligned));
+                hw_llong = (long long)(*((unsigned short*)aligned));
                 break;
             case INT_INT:
                 HDmemcpy(aligned, saved+j*sizeof(int), sizeof(int));
-                hw_llong = (long_long)(*((int*)aligned));
+                hw_llong = (long long)(*((int*)aligned));
                 break;
             case INT_UINT:
                 HDmemcpy(aligned, saved+j*sizeof(unsigned), sizeof(unsigned));
-                hw_llong = (long_long)(*((unsigned*)aligned));
+                hw_llong = (long long)(*((unsigned*)aligned));
                 break;
             case INT_LONG:
                 HDmemcpy(aligned, saved+j*sizeof(long), sizeof(long));
-                hw_llong = (long_long)(*((long*)aligned));
+                hw_llong = (long long)(*((long*)aligned));
                 break;
             case INT_ULONG:
                 HDmemcpy(aligned, saved+j*sizeof(unsigned long), sizeof(unsigned long));
-                hw_llong = (long_long)(*((unsigned long*)aligned));
+                hw_llong = (long long)(*((unsigned long*)aligned));
                 break;
             case INT_LLONG:
-                HDmemcpy(aligned, saved+j*sizeof(long_long), sizeof(long_long));
-                hw_llong = (long_long)(*((long_long*)aligned));
+                HDmemcpy(aligned, saved+j*sizeof(long long), sizeof(long long));
+                hw_llong = (long long)(*((long long*)aligned));
                 break;
             case INT_ULLONG:
-                HDmemcpy(aligned, saved+j*sizeof(unsigned long_long), sizeof(unsigned long_long));
-                hw_llong = (long_long)(*((unsigned long_long*)aligned));
+                HDmemcpy(aligned, saved+j*sizeof(unsigned long long), sizeof(unsigned long long));
+                hw_llong = (long long)(*((unsigned long long*)aligned));
                 break;
             default:
                 break;
@@ -2221,43 +2221,43 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
             switch (src_type) {
             case INT_SCHAR:
                 HDmemcpy(aligned, saved+j*sizeof(signed char), sizeof(signed char));
-                hw_ullong = (unsigned long_long)(*((signed char*)aligned));
+                hw_ullong = (unsigned long long)(*((signed char*)aligned));
                 break;
             case INT_UCHAR:
                 HDmemcpy(aligned, saved+j*sizeof(unsigned char), sizeof(unsigned char));
-                hw_ullong = (unsigned long_long)(*((unsigned char*)aligned));
+                hw_ullong = (unsigned long long)(*((unsigned char*)aligned));
                 break;
             case INT_SHORT:
                 HDmemcpy(aligned, saved+j*sizeof(short), sizeof(short));
-                hw_ullong = (unsigned long_long)(*((short*)aligned));
+                hw_ullong = (unsigned long long)(*((short*)aligned));
                 break;
             case INT_USHORT:
                 HDmemcpy(aligned, saved+j*sizeof(unsigned short), sizeof(unsigned short));
-                hw_ullong = (unsigned long_long)(*((unsigned short*)aligned));
+                hw_ullong = (unsigned long long)(*((unsigned short*)aligned));
                 break;
             case INT_INT:
                 HDmemcpy(aligned, saved+j*sizeof(int), sizeof(int));
-                hw_ullong = (unsigned long_long)(*((int*)aligned));
+                hw_ullong = (unsigned long long)(*((int*)aligned));
                 break;
             case INT_UINT:
                 HDmemcpy(aligned, saved+j*sizeof(unsigned), sizeof(unsigned));
-                hw_ullong = (unsigned long_long)(*((unsigned*)aligned));
+                hw_ullong = (unsigned long long)(*((unsigned*)aligned));
                 break;
             case INT_LONG:
                 HDmemcpy(aligned, saved+j*sizeof(long), sizeof(long));
-                hw_ullong = (unsigned long_long)(*((long*)aligned));
+                hw_ullong = (unsigned long long)(*((long*)aligned));
                 break;
             case INT_ULONG:
                 HDmemcpy(aligned, saved+j*sizeof(unsigned long), sizeof(unsigned long));
-                hw_ullong = (unsigned long_long)(*((unsigned long*)aligned));
+                hw_ullong = (unsigned long long)(*((unsigned long*)aligned));
                 break;
             case INT_LLONG:
-                HDmemcpy(aligned, saved+j*sizeof(long_long), sizeof(long_long));
-                hw_ullong = (unsigned long_long)(*((long_long*)aligned));
+                HDmemcpy(aligned, saved+j*sizeof(long long), sizeof(long long));
+                hw_ullong = (unsigned long long)(*((long long*)aligned));
                 break;
             case INT_ULLONG:
-                HDmemcpy(aligned, saved+j*sizeof(unsigned long_long), sizeof(unsigned long_long));
-                hw_ullong = (unsigned long_long)(*((unsigned long_long*)aligned));
+                HDmemcpy(aligned, saved+j*sizeof(unsigned long long), sizeof(unsigned long long));
+                hw_ullong = (unsigned long long)(*((unsigned long long*)aligned));
                 break;
             default:
                 break;
@@ -2426,12 +2426,12 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
                 printf(" %29lu\n", *((unsigned long*)aligned));
                 break;
             case INT_LLONG:
-                HDmemcpy(aligned, saved+j*sizeof(long_long), sizeof(long_long));
-                HDfprintf(stdout," %29"H5_PRINTF_LL_WIDTH"d\n", *((long_long*)aligned));
+                HDmemcpy(aligned, saved+j*sizeof(long long), sizeof(long long));
+                HDfprintf(stdout," %29"H5_PRINTF_LL_WIDTH"d\n", *((long long*)aligned));
                 break;
             case INT_ULLONG:
-                HDmemcpy(aligned, saved+j*sizeof(unsigned long_long), sizeof(unsigned long_long));
-                HDfprintf(stdout," %29"H5_PRINTF_LL_WIDTH"u\n", *((unsigned long_long*)aligned));
+                HDmemcpy(aligned, saved+j*sizeof(unsigned long long), sizeof(unsigned long long));
+                HDfprintf(stdout," %29"H5_PRINTF_LL_WIDTH"u\n", *((unsigned long long*)aligned));
                 break;
             default:
                 break;
@@ -2475,12 +2475,12 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
                 printf(" %29lu\n", *((unsigned long*)aligned));
                 break;
             case INT_LLONG:
-                HDmemcpy(aligned, buf+j*sizeof(long_long), sizeof(long_long));
-                HDfprintf(stdout," %29"H5_PRINTF_LL_WIDTH"d\n", *((long_long*)aligned));
+                HDmemcpy(aligned, buf+j*sizeof(long long), sizeof(long long));
+                HDfprintf(stdout," %29"H5_PRINTF_LL_WIDTH"d\n", *((long long*)aligned));
                 break;
             case INT_ULLONG:
-                HDmemcpy(aligned, buf+j*sizeof(long_long), sizeof(unsigned long_long));
-                HDfprintf(stdout," %29"H5_PRINTF_LL_WIDTH"u\n", *((unsigned long_long*)aligned));
+                HDmemcpy(aligned, buf+j*sizeof(long long), sizeof(unsigned long long));
+                HDfprintf(stdout," %29"H5_PRINTF_LL_WIDTH"u\n", *((unsigned long long*)aligned));
                 break;
             default:
                 break;
@@ -2516,10 +2516,10 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
                 printf(" %29lu\n", *((unsigned long*)hw));
                 break;
             case INT_LLONG:
-                HDfprintf(stdout," %29"H5_PRINTF_LL_WIDTH"d\n", *((long_long*)hw));
+                HDfprintf(stdout," %29"H5_PRINTF_LL_WIDTH"d\n", *((long long*)hw));
                 break;
             case INT_ULLONG:
-                HDfprintf(stdout," %29"H5_PRINTF_LL_WIDTH"u\n", *((unsigned long_long*)hw));
+                HDfprintf(stdout," %29"H5_PRINTF_LL_WIDTH"u\n", *((unsigned long long*)hw));
                 break;
             default:
                 break;
@@ -3478,8 +3478,8 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst)
     unsigned		hw_uint=0;
     long		hw_long=0;
     unsigned long	hw_ulong=0;
-    long_long		hw_llong=0;
-    unsigned long_long	hw_ullong=0;
+    long long		hw_llong=0;
+    unsigned long long	hw_ullong=0;
 
     /* What is the name of the source type */
     if (H5Tequal(src, H5T_NATIVE_SCHAR)) {
@@ -3650,7 +3650,7 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst)
     dst_size = H5Tget_size(dst);
     src_nbits = H5Tget_precision(src); /* not 8*src_size, esp on J90 - QAK */
     dst_nbits = H5Tget_precision(dst); /* not 8*dst_size, esp on J90 - QAK */
-    aligned = HDcalloc(1, MAX(sizeof(long double), sizeof(long_long)));
+    aligned = HDcalloc(1, MAX(sizeof(long double), sizeof(long long)));
 #ifdef SHOW_OVERFLOWS
     noverflows_g = 0;
 #endif
@@ -3707,9 +3707,9 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst)
     } else if(src_type == INT_ULONG) {
         INIT_INTEGER(unsigned long, ULONG_MAX, 0, src_size, dst_size, src_nbits, buf, saved, nelmts);
     } else if(src_type == INT_LLONG) {
-        INIT_INTEGER(long_long, LLONG_MAX, LLONG_MIN, src_size, dst_size, src_nbits, buf, saved, nelmts);
+        INIT_INTEGER(long long, LLONG_MAX, LLONG_MIN, src_size, dst_size, src_nbits, buf, saved, nelmts);
     } else if(src_type == INT_ULLONG) {
-        INIT_INTEGER(unsigned long_long, ULLONG_MAX, 0, src_size, dst_size, src_nbits, buf, saved, nelmts);
+        INIT_INTEGER(unsigned long long, ULLONG_MAX, 0, src_size, dst_size, src_nbits, buf, saved, nelmts);
     } else if(src_type == FLT_FLOAT) {
         if(run_test==TEST_NORMAL) {
             INIT_FP_NORM(float, FLT_MAX, FLT_MIN, FLT_MAX_10_EXP, FLT_MIN_10_EXP,
@@ -3795,13 +3795,13 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst)
                 hw_float = (float)(*((unsigned long*)aligned));
                 break;
             case INT_LLONG:
-                HDmemcpy(aligned, saved+j*sizeof(long_long), sizeof(long_long));
-                hw_float = (float)(*((long_long*)aligned));
+                HDmemcpy(aligned, saved+j*sizeof(long long), sizeof(long long));
+                hw_float = (float)(*((long long*)aligned));
                 break;
 #ifdef H5_ULLONG_TO_FP_CAST_WORKS
             case INT_ULLONG:
-                HDmemcpy(aligned, saved+j*sizeof(unsigned long_long), sizeof(unsigned long_long));
-                hw_float = (float)(*((unsigned long_long*)aligned));
+                HDmemcpy(aligned, saved+j*sizeof(unsigned long long), sizeof(unsigned long long));
+                hw_float = (float)(*((unsigned long long*)aligned));
                 break;
 #endif /* H5_ULLONG_TO_FP_CAST_WORKS */
             default:
@@ -3843,13 +3843,13 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst)
                 hw_double = (double)(*((unsigned long*)aligned));
                 break;
             case INT_LLONG:
-                HDmemcpy(aligned, saved+j*sizeof(long_long), sizeof(long_long));
-                hw_double = (double)(*((long_long*)aligned));
+                HDmemcpy(aligned, saved+j*sizeof(long long), sizeof(long long));
+                hw_double = (double)(*((long long*)aligned));
                 break;
 #ifdef H5_ULLONG_TO_FP_CAST_WORKS
             case INT_ULLONG:
-                HDmemcpy(aligned, saved+j*sizeof(unsigned long_long), sizeof(unsigned long_long));
-                hw_double = (double)(*((unsigned long_long*)aligned));
+                HDmemcpy(aligned, saved+j*sizeof(unsigned long long), sizeof(unsigned long long));
+                hw_double = (double)(*((unsigned long long*)aligned));
                 break;
 #endif /* H5_ULLONG_TO_FP_CAST_WORKS */
             default:
@@ -3892,13 +3892,13 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst)
                 hw_ldouble = (long double)(*((unsigned long*)aligned));
                 break;
             case INT_LLONG:
-                HDmemcpy(aligned, saved+j*sizeof(long_long), sizeof(long_long));
-                hw_ldouble = (long double)(*((long_long*)aligned));
+                HDmemcpy(aligned, saved+j*sizeof(long long), sizeof(long long));
+                hw_ldouble = (long double)(*((long long*)aligned));
                 break;
 #ifdef H5_ULLONG_TO_FP_CAST_WORKS
             case INT_ULLONG:
-                HDmemcpy(aligned, saved+j*sizeof(unsigned long_long), sizeof(unsigned long_long));
-                hw_ldouble = (long double)(*((unsigned long_long*)aligned));
+                HDmemcpy(aligned, saved+j*sizeof(unsigned long long), sizeof(unsigned long long));
+                hw_ldouble = (long double)(*((unsigned long long*)aligned));
                 break;
 #endif /* H5_ULLONG_TO_FP_CAST_WORKS */
             default:
@@ -4070,16 +4070,16 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst)
             switch (src_type) {
             case FLT_FLOAT:
                 HDmemcpy(aligned, saved+j*sizeof(float), sizeof(float));
-                hw_llong = (long_long)(*((float*)aligned));
+                hw_llong = (long long)(*((float*)aligned));
                 break;
             case FLT_DOUBLE:
                 HDmemcpy(aligned, saved+j*sizeof(double), sizeof(double));
-                hw_llong = (long_long)(*((double*)aligned));
+                hw_llong = (long long)(*((double*)aligned));
                 break;
 #if H5_SIZEOF_LONG_DOUBLE !=0
             case FLT_LDOUBLE:
                 HDmemcpy(aligned, saved+j*sizeof(long double), sizeof(long double));
-                hw_llong = (long_long)(*((long double*)aligned));
+                hw_llong = (long long)(*((long double*)aligned));
                 break;
 #endif
             default:
@@ -4090,16 +4090,16 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst)
             switch (src_type) {
             case FLT_FLOAT:
                 HDmemcpy(aligned, saved+j*sizeof(float), sizeof(float));
-                hw_ullong = (unsigned long_long)(*((float*)aligned));
+                hw_ullong = (unsigned long long)(*((float*)aligned));
                 break;
             case FLT_DOUBLE:
                 HDmemcpy(aligned, saved+j*sizeof(double), sizeof(double));
-                hw_ullong = (unsigned long_long)(*((double*)aligned));
+                hw_ullong = (unsigned long long)(*((double*)aligned));
                 break;
 #if H5_SIZEOF_LONG_DOUBLE !=0
             case FLT_LDOUBLE:
                 HDmemcpy(aligned, saved+j*sizeof(long double), sizeof(long double));
-                hw_ullong = (unsigned long_long)(*((long double*)aligned));
+                hw_ullong = (unsigned long long)(*((long double*)aligned));
                 break;
 #endif
             default:
@@ -4258,10 +4258,10 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst)
             if((tmp_s+1)==tmp_h || (tmp_s-1)==tmp_h)
                 continue; /*no error*/
         } /* end if */
-        else if (dst_size==sizeof(unsigned long_long)) {
-            unsigned long_long tmp_s, tmp_h;
-            HDmemcpy(&tmp_s,&buf[j*dst_size],sizeof(unsigned long_long));
-            HDmemcpy(&tmp_h,&hw[0],sizeof(unsigned long_long));
+        else if (dst_size==sizeof(unsigned long long)) {
+            unsigned long long tmp_s, tmp_h;
+            HDmemcpy(&tmp_s,&buf[j*dst_size],sizeof(unsigned long long));
+            HDmemcpy(&tmp_h,&hw[0],sizeof(unsigned long long));
             if((tmp_s+1)==tmp_h || (tmp_s-1)==tmp_h)
                 continue; /*no error*/
         } /* end if */
@@ -4273,9 +4273,9 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst)
 */
 #ifndef H5_FP_TO_ULLONG_BOTTOM_BIT_WORKS
         if((src_type==FLT_FLOAT || src_type==FLT_DOUBLE) && dst_type==INT_ULLONG) {
-            unsigned long_long tmp_s, tmp_h;
-            HDmemcpy(&tmp_s,&buf[j*dst_size],sizeof(unsigned long_long));
-            HDmemcpy(&tmp_h,&hw[0],sizeof(unsigned long_long));
+            unsigned long long tmp_s, tmp_h;
+            HDmemcpy(&tmp_s,&buf[j*dst_size],sizeof(unsigned long long));
+            HDmemcpy(&tmp_h,&hw[0],sizeof(unsigned long long));
             if((tmp_s+1)==tmp_h)
                 continue; /*no error*/
         }
@@ -4347,12 +4347,12 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst)
                 printf(" %29lu\n", *((unsigned long*)aligned));
                 break;
             case INT_LLONG:
-                HDmemcpy(aligned, saved+j*sizeof(long_long), sizeof(long_long));
-                HDfprintf(stdout," %29"H5_PRINTF_LL_WIDTH"d\n", *((long_long*)aligned));
+                HDmemcpy(aligned, saved+j*sizeof(long long), sizeof(long long));
+                HDfprintf(stdout," %29"H5_PRINTF_LL_WIDTH"d\n", *((long long*)aligned));
                 break;
             case INT_ULLONG:
-                HDmemcpy(aligned, saved+j*sizeof(unsigned long_long), sizeof(unsigned long_long));
-                HDfprintf(stdout," %29"H5_PRINTF_LL_WIDTH"u\n", *((unsigned long_long*)aligned));
+                HDmemcpy(aligned, saved+j*sizeof(unsigned long long), sizeof(unsigned long long));
+                HDfprintf(stdout," %29"H5_PRINTF_LL_WIDTH"u\n", *((unsigned long long*)aligned));
                 break;
             case FLT_FLOAT:
                 HDmemcpy(aligned, saved+j*sizeof(float), sizeof(float));
@@ -4410,12 +4410,12 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst)
                 printf(" %29lu\n", *((unsigned long*)aligned));
                 break;
             case INT_LLONG:
-                HDmemcpy(aligned, buf+j*sizeof(long_long), sizeof(long_long));
-                HDfprintf(stdout," %29"H5_PRINTF_LL_WIDTH"d\n", *((long_long*)aligned));
+                HDmemcpy(aligned, buf+j*sizeof(long long), sizeof(long long));
+                HDfprintf(stdout," %29"H5_PRINTF_LL_WIDTH"d\n", *((long long*)aligned));
                 break;
             case INT_ULLONG:
-                HDmemcpy(aligned, buf+j*sizeof(unsigned long_long), sizeof(unsigned long_long));
-                HDfprintf(stdout," %29"H5_PRINTF_LL_WIDTH"u\n", *((unsigned long_long*)aligned));
+                HDmemcpy(aligned, buf+j*sizeof(unsigned long long), sizeof(unsigned long long));
+                HDfprintf(stdout," %29"H5_PRINTF_LL_WIDTH"u\n", *((unsigned long long*)aligned));
                 break;
             case FLT_FLOAT:
                 HDmemcpy(aligned, buf+j*sizeof(float), sizeof(float));
@@ -4465,10 +4465,10 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst)
                 printf(" %29lu\n", *((unsigned long*)hw));
                 break;
             case INT_LLONG:
-                printf(" %29"H5_PRINTF_LL_WIDTH"d\n", *((long_long*)hw));
+                printf(" %29"H5_PRINTF_LL_WIDTH"d\n", *((long long*)hw));
                 break;
             case INT_ULLONG:
-                printf(" %29"H5_PRINTF_LL_WIDTH"u\n", *((unsigned long_long*)hw));
+                printf(" %29"H5_PRINTF_LL_WIDTH"u\n", *((unsigned long long*)hw));
                 break;
             case FLT_FLOAT:
                 printf(" %29f\n", *((float*)hw));
diff --git a/test/dtransform.c b/test/dtransform.c
index c5a4fa8..3297fe6 100644
--- a/test/dtransform.c
+++ b/test/dtransform.c
@@ -265,14 +265,14 @@ int main(void)
     TEST_TYPE_CONTIG(dxpl_id_utrans_inv, unsigned long, H5T_NATIVE_ULONG, "ulong", transformData, 0);
 
 #ifdef H5_LLONG_TO_FP_CAST_WORKS
-    TEST_TYPE_CONTIG(dxpl_id_c_to_f, long_long, H5T_NATIVE_LLONG, "llong", windchillFfloat, 1);
+    TEST_TYPE_CONTIG(dxpl_id_c_to_f, long long, H5T_NATIVE_LLONG, "llong", windchillFfloat, 1);
 #else
     TESTING("contiguous, with type conversion (float->llong)")
     SKIPPED()
 #endif
 
 #ifdef H5_ULLONG_TO_FP_CAST_WORKS
-    TEST_TYPE_CONTIG(dxpl_id_utrans_inv, unsigned long_long, H5T_NATIVE_ULLONG, "ullong", transformData, 0);
+    TEST_TYPE_CONTIG(dxpl_id_utrans_inv, unsigned long long, H5T_NATIVE_ULLONG, "ullong", transformData, 0);
 #else
     TESTING("contiguous, with type conversion (float->ullong)")
     SKIPPED()
@@ -293,14 +293,14 @@ int main(void)
     TEST_TYPE_CHUNK(dxpl_id_c_to_f, long, H5T_NATIVE_LONG, "long", windchillFfloat, 1);
     TEST_TYPE_CHUNK(dxpl_id_utrans_inv, unsigned long, H5T_NATIVE_ULONG, "ulong", transformData, 0);
 #ifdef H5_LLONG_TO_FP_CAST_WORKS
-    TEST_TYPE_CHUNK(dxpl_id_c_to_f, long_long, H5T_NATIVE_LLONG, "llong", windchillFfloat, 1);
+    TEST_TYPE_CHUNK(dxpl_id_c_to_f, long long, H5T_NATIVE_LLONG, "llong", windchillFfloat, 1);
 #else
     TESTING("chunked, with type conversion (float->llong)")
     SKIPPED()
 #endif
 
 #ifdef H5_ULLONG_TO_FP_CAST_WORKS
-    TEST_TYPE_CHUNK(dxpl_id_utrans_inv, unsigned long_long, H5T_NATIVE_ULLONG, "ullong", transformData, 0);
+    TEST_TYPE_CHUNK(dxpl_id_utrans_inv, unsigned long long, H5T_NATIVE_ULLONG, "ullong", transformData, 0);
 #else
     TESTING("chunked, with type conversion (float->ullong)")
     SKIPPED()
diff --git a/test/earray.c b/test/earray.c
index 6935a15..7b68e95 100644
--- a/test/earray.c
+++ b/test/earray.c
@@ -2381,14 +2381,14 @@ main(void)
                     nelmts = (hsize_t)(1 + cparam.idx_blk_elmts +
                         tparam.sblk_info[sblk].start_idx +
                         (tparam.sblk_info[sblk].dblk_nelmts * dblk));
-                    sprintf(test_str, "setting first element of array's data block #%llu", (unsigned long_long)ndblks);
+                    sprintf(test_str, "setting first element of array's data block #%llu", (unsigned long long)ndblks);
                     nerrors += test_set_elmts(fapl, &cparam, &tparam, nelmts, test_str);
 
                     /* Test all elements in data block */
                     nelmts = (hsize_t)(cparam.idx_blk_elmts +
                         tparam.sblk_info[sblk].start_idx +
                         (tparam.sblk_info[sblk].dblk_nelmts * (dblk + 1)));
-                    sprintf(test_str, "setting all elements of array's data block #%llu", (unsigned long_long)ndblks);
+                    sprintf(test_str, "setting all elements of array's data block #%llu", (unsigned long long)ndblks);
                     nerrors += test_set_elmts(fapl, &cparam, &tparam, nelmts, test_str);
 
                     /* Increment data block being tested */
diff --git a/test/ntypes.c b/test/ntypes.c
index c8e7ccd..a82f051 100644
--- a/test/ntypes.c
+++ b/test/ntypes.c
@@ -284,7 +284,7 @@ test_compound_dtype2(hid_t file)
         char            c;
         int             i;
         s2              st;
-        unsigned long_long       l;
+        unsigned long long       l;
     } s1;
     hid_t		dataset, space;
     hid_t               dtype, native_type, tid, tid2, tid_m, tid_m2,
@@ -310,7 +310,7 @@ test_compound_dtype2(hid_t file)
 	    temp_point->i = n++;
 	    temp_point->st.c2 = (short)(i + j);
 	    temp_point->st.l2 = (i * 5 + j * 50) * n;
-	    temp_point->l = (unsigned long_long)((i * 10 + j * 100) * n);
+	    temp_point->l = (unsigned long long)((i * 10 + j * 100) * n);
 	}
     }
 
@@ -531,7 +531,7 @@ test_compound_dtype(hid_t file)
     typedef struct {
         char            c;
         unsigned int    i;
-        long_long       l;
+        long long       l;
     } s1;
     hid_t		dataset, space;
     hid_t               dtype, native_type, tid, tid2, mem_id;
@@ -703,7 +703,7 @@ test_compound_dtype3(hid_t file)
     typedef struct {
         char            c;
         int             a[5];
-        long_long       l;
+        long long       l;
     } s1;
     hid_t		dataset, space;
     hid_t               dtype, native_type, tid, tid2, tid_m, tid_m2,
@@ -902,7 +902,7 @@ test_compound_opaque(hid_t file)
     typedef struct {
         char            c;
         unsigned char   o[5];
-        long_long       l;
+        long long       l;
     } s1;
     hid_t		dataset, space;
     hid_t               dtype, native_type, tid, tid2, tid_m,
@@ -1218,7 +1218,7 @@ test_array_dtype(hid_t file)
     typedef struct {
         char    c;
         int     i;
-        long_long l;
+        long long l;
     } s1;
     hid_t		dataset, space;
     hid_t               dtype, native_type, tid, tid2, tid3, tid_m;
diff --git a/test/tconfig.c b/test/tconfig.c
index d4d7d4b..355191d 100644
--- a/test/tconfig.c
+++ b/test/tconfig.c
@@ -127,7 +127,7 @@ test_config_ctypes(void)
 
     /* standard C99 basic types */
 #if H5_SIZEOF_LONG_LONG > 0
-    vrfy_cint_type(long_long, unsigned long_long, H5_SIZEOF_LONG_LONG);
+    vrfy_cint_type(long long, unsigned long long, H5_SIZEOF_LONG_LONG);
 #endif
 
 #if H5_SIZEOF_INT8_T > 0