summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorRobb Matzke <matzke@llnl.gov>1998-11-19 17:36:27 (GMT)
committerRobb Matzke <matzke@llnl.gov>1998-11-19 17:36:27 (GMT)
commit68bff3d352a5a8d87f582fb1a84361f3006b5ff4 (patch)
tree490fe50ff8f40d6ac0230cba0755e3c929594f0f /tools
parent04979ec732605b34b956cc2c77e4d7fa75d59e47 (diff)
downloadhdf5-68bff3d352a5a8d87f582fb1a84361f3006b5ff4.zip
hdf5-68bff3d352a5a8d87f582fb1a84361f3006b5ff4.tar.gz
hdf5-68bff3d352a5a8d87f582fb1a84361f3006b5ff4.tar.bz2
[svn-r928] Changes since 19981118
---------------------- ./src/H5.c ./src/H5Smpio.c ./src/H5T.c ./src/H5Tconv.c ./src/H5Tpublic.h ./src/H5detect.c ./src/H5private.h ./src/H5public.h ./test/big.c The `long long' type isn't quite as prevalent as we had hoped; there is at least one system that defines `__int64' but not `long long'. Therefore, I've temporarily changed all occurrences of `long long' to `long_long' and then #define that in H5private.h based on the existence of `long long' or `__int64'. This gets rid of some #ifdef's in other parts of the code. The semantics of the hdf5 types are: *int8_t Exactly one byte *int16_t At least two bytes. We favor 32-bit integers over 16-bit integers if the 16-bit integer is 4-bytes wide (Cray) *int32_t At least four bytes. *int64_t At least eight bytes long_long The widest integral integer type The H5Smpio.c contains debugging code which is non-portable. ./tools/h5ls.c Changed the order native types are detected so we favor the name `int' over `short' or `long' if two of them are the same. ./config/conclude.in Added a rule to make test programs depend on the hdf5 library. This fixes a minor bug where changing H5detect.c and then running `make test' caused H5Tinit.c to not be recompiled and therefore the test files are not relinked.
Diffstat (limited to 'tools')
-rw-r--r--tools/h5ls.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/h5ls.c b/tools/h5ls.c
index 4423b31..4e21cca 100644
--- a/tools/h5ls.c
+++ b/tools/h5ls.c
@@ -176,14 +176,14 @@ display_native_type(hid_t type, int __unused__ indent)
printf("native char");
} else if (H5Tequal(type, H5T_NATIVE_UCHAR)) {
printf("native unsigned char");
- } else if (H5Tequal(type, H5T_NATIVE_SHORT)) {
- printf("native short");
- } else if (H5Tequal(type, H5T_NATIVE_USHORT)) {
- printf("native unsigned short");
} else if (H5Tequal(type, H5T_NATIVE_INT)) {
printf("native int");
} else if (H5Tequal(type, H5T_NATIVE_UINT)) {
printf("native unsigned int");
+ } else if (H5Tequal(type, H5T_NATIVE_SHORT)) {
+ printf("native short");
+ } else if (H5Tequal(type, H5T_NATIVE_USHORT)) {
+ printf("native unsigned short");
} else if (H5Tequal(type, H5T_NATIVE_LONG)) {
printf("native long");
} else if (H5Tequal(type, H5T_NATIVE_ULONG)) {