mirror of
https://github.com/HDFGroup/hdf5.git
synced 2025-03-01 16:28:09 +08:00
[svn-r7043] Purpose:
Windows portability fix Description: Change "long long"s in code to "long_long"s, which is the portable version of this type. Platforms tested: FreeBSD 4.8 (sleipnir) to small for h5committest
This commit is contained in:
parent
20848c55fd
commit
3f7ec1a4b8
@ -381,7 +381,7 @@ H5T_get_native_type(H5T_t *dtype, H5T_direction_t direction, size_t *struct_alig
|
||||
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot get member value");
|
||||
HDmemcpy(memb_value, tmp_memb_value, H5T_get_size(super_type));
|
||||
|
||||
if(H5Tconvert(super_type_id, nat_super_type_id, 1, memb_value, NULL, H5P_DEFAULT)<0)
|
||||
if(H5Tconvert(super_type_id, nat_super_type_id, (hsize_t)1, memb_value, NULL, H5P_DEFAULT)<0)
|
||||
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot get member value");
|
||||
|
||||
if(H5T_enum_insert(new_type, memb_name, memb_value)<0)
|
||||
@ -554,22 +554,22 @@ H5T_get_native_integer(size_t size, H5T_sign_t sign, H5T_direction_t direction,
|
||||
native_size = sizeof(long);
|
||||
} else if(size<=sizeof(long_long)) {
|
||||
match=H5T_NATIVE_INT_MATCH_LLONG;
|
||||
native_size = sizeof(long long);
|
||||
native_size = sizeof(long_long);
|
||||
} else { /* If no native type matches the querried datatype, simply choose the type of biggest size. */
|
||||
match=H5T_NATIVE_INT_MATCH_LLONG;
|
||||
native_size = sizeof(long long);
|
||||
native_size = sizeof(long_long);
|
||||
}
|
||||
} else if(direction == H5T_DIR_DESCEND) {
|
||||
if(size>=sizeof(long_long)) {
|
||||
match=H5T_NATIVE_INT_MATCH_LLONG;
|
||||
native_size = sizeof(long long);
|
||||
native_size = sizeof(long_long);
|
||||
} else if(size>=sizeof(long)) {
|
||||
if(size==sizeof(long)) {
|
||||
match=H5T_NATIVE_INT_MATCH_LONG;
|
||||
native_size = sizeof(long);
|
||||
} else {
|
||||
match=H5T_NATIVE_INT_MATCH_LLONG;
|
||||
native_size = sizeof(long long);
|
||||
native_size = sizeof(long_long);
|
||||
}
|
||||
}
|
||||
else if(size>=sizeof(int)) {
|
||||
|
Loading…
Reference in New Issue
Block a user