diff options
Diffstat (limited to 'hl')
| -rw-r--r-- | hl/fortran/src/H5IMcc.c | 10 | ||||
| -rwxr-xr-x | hl/fortran/src/H5LTfc.c | 4 | ||||
| -rw-r--r-- | hl/src/H5LT.c | 4 | ||||
| -rw-r--r-- | hl/src/H5LTparse.c | 2 | ||||
| -rw-r--r-- | hl/src/H5LTpublic.h | 4 |
5 files changed, 12 insertions, 12 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; diff --git a/hl/src/H5LT.c b/hl/src/H5LT.c index 78df61a..92965fd 100644 --- a/hl/src/H5LT.c +++ b/hl/src/H5LT.c @@ -1227,7 +1227,7 @@ herr_t H5LTset_attribute_long( hid_t loc_id, herr_t H5LTset_attribute_long_long( hid_t loc_id, const char *obj_name, const char *attr_name, - const long_long *data, + const long long *data, size_t size ) { @@ -2557,7 +2557,7 @@ herr_t H5LTget_attribute_long( hid_t loc_id, herr_t H5LTget_attribute_long_long( hid_t loc_id, const char *obj_name, const char *attr_name, - long_long *data ) + long long *data ) { /* Get the attribute */ if(H5LT_get_attribute_mem(loc_id, obj_name, attr_name, H5T_NATIVE_LLONG, data) < 0) diff --git a/hl/src/H5LTparse.c b/hl/src/H5LTparse.c index 9f67175..6e5e08b 100644 --- a/hl/src/H5LTparse.c +++ b/hl/src/H5LTparse.c @@ -1053,7 +1053,7 @@ case 92: short short_val=(short)yylval.ival; int int_val=(int)yylval.ival; long long_val=(long)yylval.ival; - long_long llong_val=(long_long)yylval.ival; + long long llong_val=(long long)yylval.ival; hid_t super = H5Tget_super(enum_id); hid_t native = H5Tget_native_type(super, H5T_DIR_ASCEND); diff --git a/hl/src/H5LTpublic.h b/hl/src/H5LTpublic.h index 05670d2..7fb873a 100644 --- a/hl/src/H5LTpublic.h +++ b/hl/src/H5LTpublic.h @@ -203,7 +203,7 @@ H5_HLDLL herr_t H5LTset_attribute_long( hid_t loc_id, H5_HLDLL herr_t H5LTset_attribute_long_long( hid_t loc_id, const char *obj_name, const char *attr_name, - const long_long *buffer, + const long long *buffer, size_t size ); H5_HLDLL herr_t H5LTset_attribute_ulong( hid_t loc_id, @@ -280,7 +280,7 @@ H5_HLDLL herr_t H5LTget_attribute_long( hid_t loc_id, H5_HLDLL herr_t H5LTget_attribute_long_long( hid_t loc_id, const char *obj_name, const char *attr_name, - long_long *data ); + long long *data ); H5_HLDLL herr_t H5LTget_attribute_ulong( hid_t loc_id, const char *obj_name, |