diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2009-02-18 20:05:49 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2009-02-18 20:05:49 (GMT) |
| commit | c880943ce9d588a58aecebeb7d2ecf978e02616b (patch) | |
| tree | f3e499ba6b61c4fe4af43d4787d59b203b444da5 /hl/fortran | |
| parent | 61346d50fab0dbaadd313e46cc968d4e4ad26c82 (diff) | |
| download | hdf5-c880943ce9d588a58aecebeb7d2ecf978e02616b.zip hdf5-c880943ce9d588a58aecebeb7d2ecf978e02616b.tar.gz hdf5-c880943ce9d588a58aecebeb7d2ecf978e02616b.tar.bz2 | |
[svn-r16490] Fixed bug #1459 by eliminating the macro long_long and replacing all instances with long long.
Tested:
h5comittest
fedora 10 x64
XP32, VNET
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; |