summaryrefslogtreecommitdiffstats
path: root/tools/h5ls
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2009-02-18 20:02:05 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2009-02-18 20:02:05 (GMT)
commit5d69e87ff0f4a4c3ce72b69a944b73b46b5c2b7c (patch)
tree6bfe2263c050603e228fb929ad236a5069c11fae /tools/h5ls
parent85dc39846e418b7abd0e0b951f52d474a82eac80 (diff)
downloadhdf5-5d69e87ff0f4a4c3ce72b69a944b73b46b5c2b7c.zip
hdf5-5d69e87ff0f4a4c3ce72b69a944b73b46b5c2b7c.tar.gz
hdf5-5d69e87ff0f4a4c3ce72b69a944b73b46b5c2b7c.tar.bz2
[svn-r16489] Fixed bug #1459 by eliminating the macro long_long and replacing all instances with long long.
Tested: h5comittest fedora 10 x64 Vista 32, VS2005, IVF101 XP32, Cygwin
Diffstat (limited to 'tools/h5ls')
-rw-r--r--tools/h5ls/h5ls.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/h5ls/h5ls.c b/tools/h5ls/h5ls.c
index 0c492d0..ca0ddcb 100644
--- a/tools/h5ls/h5ls.c
+++ b/tools/h5ls/h5ls.c
@@ -770,11 +770,11 @@ display_enum_type(hid_t type, int ind)
/* Determine what data type to use for the native values. To simplify
* things we entertain three possibilities:
- * 1. long_long -- the largest native signed integer
- * 2. unsigned long_long -- the largest native unsigned integer
+ * 1. long long -- the largest native signed integer
+ * 2. unsigned long long -- the largest native unsigned integer
* 3. raw format */
- if (H5Tget_size(type)<=sizeof(long_long)) {
- dst_size = sizeof(long_long);
+ if (H5Tget_size(type)<=sizeof(long long)) {
+ dst_size = sizeof(long long);
if (H5T_SGN_NONE==H5Tget_sign(type)) {
native = H5T_NATIVE_ULLONG;
} else {
@@ -813,13 +813,13 @@ display_enum_type(hid_t type, int ind)
*strangely, unless use another pointer "copy".*/
copy = value+i*dst_size;
HDfprintf(stdout,"%"H5_PRINTF_LL_WIDTH"u",
- *((unsigned long_long*)((void*)copy)));
+ *((unsigned long long*)((void*)copy)));
} else {
/*On SGI Altix(cobalt), wrong values were printed out with "value+i*dst_size"
*strangely, unless use another pointer "copy".*/
copy = value+i*dst_size;
HDfprintf(stdout,"%"H5_PRINTF_LL_WIDTH"d",
- *((long_long*)((void*)copy)));
+ *((long long*)((void*)copy)));
}
}