[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

2 files changed, 13 insertions, 13 deletions

diff --git a/fortran/src/H5_f.c b/fortran/src/H5_f.c
index 915f8cb..d7bb3d8 100644
--- a/fortran/src/H5_f.c
+++ b/fortran/src/H5_f.c
@@ -56,7 +56,7 @@ nh5init_types_c( hid_t_f * types, hid_t_f * floatingtypes, hid_t_f * integertype
     if ((types[0] = (hid_t_f)H5Tcopy(H5T_NATIVE_LONG)) < 0) return ret_value;
     } /*end if */
     else
-    if (sizeof(int_f) == sizeof(long_long)) {
+    if (sizeof(int_f) == sizeof(long long)) {
     if ((types[0] = (hid_t_f)H5Tcopy(H5T_NATIVE_LLONG)) < 0) return ret_value;
     } /*end else */
 
@@ -115,7 +115,7 @@ nh5init_types_c( hid_t_f * types, hid_t_f * floatingtypes, hid_t_f * integertype
     else if (sizeof(int_1_f) == sizeof(int)) {
       if ((types[6] = (hid_t_f)H5Tcopy(H5T_NATIVE_INT)) < 0) return ret_value;
     } /*end if */
-    else if (sizeof(int_1_f) == sizeof(long_long)) {
+    else if (sizeof(int_1_f) == sizeof(long long)) {
 	if ((types[6] = (hid_t_f)H5Tcopy(H5T_NATIVE_LLONG)) < 0) return ret_value;
     } /*end else */
 
@@ -128,7 +128,7 @@ nh5init_types_c( hid_t_f * types, hid_t_f * floatingtypes, hid_t_f * integertype
     else if (sizeof(int_2_f) == sizeof(int)) {
       if ((types[7] = (hid_t_f)H5Tcopy(H5T_NATIVE_INT)) < 0) return ret_value;
     } /*end if */
-    else if (sizeof(int_2_f) == sizeof(long_long)) {
+    else if (sizeof(int_2_f) == sizeof(long long)) {
 	if ((types[7] = (hid_t_f)H5Tcopy(H5T_NATIVE_LLONG)) < 0) return ret_value;
     } /*end else */
 
@@ -141,7 +141,7 @@ nh5init_types_c( hid_t_f * types, hid_t_f * floatingtypes, hid_t_f * integertype
     else if (sizeof(int_4_f) == sizeof(int)) {
       if ((types[8] = (hid_t_f)H5Tcopy(H5T_NATIVE_INT)) < 0) return ret_value;
     } /*end if */
-    else if (sizeof(int_4_f) == sizeof(long_long)) {
+    else if (sizeof(int_4_f) == sizeof(long long)) {
 	if ((types[8] = (hid_t_f)H5Tcopy(H5T_NATIVE_LLONG)) < 0) return ret_value;
     } /*end else */
 
@@ -154,7 +154,7 @@ nh5init_types_c( hid_t_f * types, hid_t_f * floatingtypes, hid_t_f * integertype
     else if (sizeof(int_8_f) == sizeof(int)) {
       if ((types[9] = (hid_t_f)H5Tcopy(H5T_NATIVE_INT)) < 0) return ret_value;
     } /*end if */
-    else if (sizeof(int_8_f) == sizeof(long_long)) {
+    else if (sizeof(int_8_f) == sizeof(long long)) {
 	if ((types[9] = (hid_t_f)H5Tcopy(H5T_NATIVE_LLONG)) < 0) return ret_value;
     } /*end else */
 
diff --git a/fortran/src/H5match_types.c b/fortran/src/H5match_types.c
index 034ff72..091d0c8 100644
--- a/fortran/src/H5match_types.c
+++ b/fortran/src/H5match_types.c
@@ -160,8 +160,8 @@ int main()
   /* First, define c_int_x */
 
 #if defined H5_FORTRAN_HAS_INTEGER_1
-  if(sizeof(long_long) == 1)
-    writeTypedef("long_long", 1);
+  if(sizeof(long long) == 1)
+    writeTypedef("long long", 1);
   else if(sizeof(long) == 1)
     writeTypedef("long", 1);
   else if(sizeof(int) == 1)
@@ -176,8 +176,8 @@ int main()
 #endif /*H5_FORTRAN_HAS_INTEGER_1 */
 
 #if defined H5_FORTRAN_HAS_INTEGER_2
-  if(sizeof(long_long) == 2)
-    writeTypedef("long_long", 2);
+  if(sizeof(long long) == 2)
+    writeTypedef("long long", 2);
   else if(sizeof(long) == 2)
     writeTypedef("long", 2);
   else if(sizeof(int) == 2)
@@ -189,8 +189,8 @@ int main()
 #endif /*H5_FORTRAN_HAS_INTEGER_2 */
 
 #if defined H5_FORTRAN_HAS_INTEGER_4
-  if(sizeof(long_long) == 4)
-    writeTypedef("long_long", 4);
+  if(sizeof(long long) == 4)
+    writeTypedef("long long", 4);
   else if(sizeof(long) == 4)
     writeTypedef("long", 4);
   else if(sizeof(int) == 4)
@@ -202,8 +202,8 @@ int main()
 #endif /*H5_FORTRAN_HAS_INTEGER_4 */
 
 #if defined H5_FORTRAN_HAS_INTEGER_8
-  if(sizeof(long_long) == 8)
-    writeTypedef("long_long", 8);
+  if(sizeof(long long) == 8)
+    writeTypedef("long long", 8);
   else if(sizeof(long) == 8)
     writeTypedef("long", 8);
   else if(sizeof(int) == 8)