diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2009-02-24 17:59:14 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-02-24 17:59:14 (GMT) |
commit | 33a65add7db18a4efd2b34ac8261c2065820ebf9 (patch) | |
tree | 782730a42955d1a247fec9356c5d05f83cce4903 /hl/fortran | |
parent | e63f0baf7e3a8e36c19f52d7692b483b7440e5eb (diff) | |
download | hdf5-33a65add7db18a4efd2b34ac8261c2065820ebf9.zip hdf5-33a65add7db18a4efd2b34ac8261c2065820ebf9.tar.gz hdf5-33a65add7db18a4efd2b34ac8261c2065820ebf9.tar.bz2 |
[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
Diffstat (limited to 'hl/fortran')
-rw-r--r-- | hl/fortran/src/H5IMcc.c | 10 | ||||
-rwxr-xr-x | hl/fortran/src/H5LTfc.c | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/hl/fortran/src/H5IMcc.c b/hl/fortran/src/H5IMcc.c index 492e8b8..8f0e29e 100644 --- a/hl/fortran/src/H5IMcc.c +++ b/hl/fortran/src/H5IMcc.c @@ -87,7 +87,7 @@ herr_t H5IMmake_image_8bitf(hid_t loc_id, } else if(sizeof(int_f) == sizeof(long)) { if(H5Dwrite(did, H5T_NATIVE_LONG, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) return -1; - } else if(sizeof(int_f) == sizeof(long_long)) { + } else if(sizeof(int_f) == sizeof(long long)) { if(H5Dwrite(did, H5T_NATIVE_LLONG, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) return -1; } else @@ -200,7 +200,7 @@ herr_t H5IMmake_image_24bitf(hid_t loc_id, } else if(sizeof(int_f) == sizeof(long)) { if(H5Dwrite(did, H5T_NATIVE_LONG, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) return -1; - } else if(sizeof(int_f) == sizeof(long_long)) { + } else if(sizeof(int_f) == sizeof(long long)) { if(H5Dwrite(did, H5T_NATIVE_LLONG, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) return -1; } else @@ -276,7 +276,7 @@ herr_t H5IMread_imagef(hid_t loc_id, tid = H5T_NATIVE_INT; else if(sizeof(int_f) == sizeof(long)) tid = H5T_NATIVE_LONG; - else if(sizeof(int_f) == sizeof(long_long)) + else if(sizeof(int_f) == sizeof(long long)) tid = H5T_NATIVE_LLONG; else goto out; @@ -360,7 +360,7 @@ herr_t H5IMmake_palettef(hid_t loc_id, } else if(sizeof(int_f) == sizeof(long)) { if(H5Dwrite(did, H5T_NATIVE_LONG, H5S_ALL, H5S_ALL, H5P_DEFAULT, pal_data) < 0) return -1; - } else if(sizeof(int_f) == sizeof(long_long)) { + } else if(sizeof(int_f) == sizeof(long long)) { if(H5Dwrite(did, H5T_NATIVE_LLONG, H5S_ALL, H5S_ALL, H5P_DEFAULT, pal_data) < 0) return -1; } else @@ -424,7 +424,7 @@ herr_t H5IMget_palettef(hid_t loc_id, return H5IM_get_palette(loc_id,image_name,pal_number,H5T_NATIVE_INT,pal_data); else if(sizeof(int_f) == sizeof(long)) return H5IM_get_palette(loc_id,image_name,pal_number,H5T_NATIVE_LONG,pal_data); - else if(sizeof(int_f) == sizeof(long_long)) + else if(sizeof(int_f) == sizeof(long long)) return H5IM_get_palette(loc_id,image_name,pal_number,H5T_NATIVE_LLONG,pal_data); else return -1; diff --git a/hl/fortran/src/H5LTfc.c b/hl/fortran/src/H5LTfc.c index 6aa3354..93d65ef 100755 --- a/hl/fortran/src/H5LTfc.c +++ b/hl/fortran/src/H5LTfc.c @@ -682,7 +682,7 @@ nh5ltset_attribute_int_c(hid_t_f *loc_id, ret = H5LTset_attribute_int(c_loc_id,c_name,c_attrname,buf,c_size); else if (sizeof(int_f) == sizeof(long)) ret = H5LTset_attribute_long(c_loc_id,c_name,c_attrname,buf,c_size); - else if (sizeof(int_f) == sizeof(long_long)) + else if (sizeof(int_f) == sizeof(long long)) ret = H5LTset_attribute_long_long(c_loc_id,c_name,c_attrname,buf,c_size); else return ret_value; @@ -928,7 +928,7 @@ nh5ltget_attribute_int_c(hid_t_f *loc_id, ret = H5LTget_attribute_int(c_loc_id,c_name,c_attrname,buf); else if (sizeof(int_f) == sizeof(long)) ret = H5LTget_attribute_long(c_loc_id,c_name,c_attrname,buf); - else if (sizeof(int_f) == sizeof(long_long)) + else if (sizeof(int_f) == sizeof(long long)) ret = H5LTget_attribute_long_long(c_loc_id,c_name,c_attrname,buf); else return ret_value; |