summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2003-06-16 15:57:18 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2003-06-16 15:57:18 (GMT)
commit3f7ec1a4b8829da478d117d1b438ce1cb188cdcc (patch)
tree4050f3d9ada03d933dbf470e75ae66935a818c4c
parent20848c55fd4277e7a24bf8f3860e3a20033f0f22 (diff)
downloadhdf5-3f7ec1a4b8829da478d117d1b438ce1cb188cdcc.zip
hdf5-3f7ec1a4b8829da478d117d1b438ce1cb188cdcc.tar.gz
hdf5-3f7ec1a4b8829da478d117d1b438ce1cb188cdcc.tar.bz2
[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
-rw-r--r--src/H5Tnative.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/H5Tnative.c b/src/H5Tnative.c
index 6248e27..9fd9bbe 100644
--- a/src/H5Tnative.c
+++ b/src/H5Tnative.c
@@ -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)) {