summaryrefslogtreecommitdiffstats
path: root/tools/h5import
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2009-02-18 20:05:49 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2009-02-18 20:05:49 (GMT)
commitc880943ce9d588a58aecebeb7d2ecf978e02616b (patch)
treef3e499ba6b61c4fe4af43d4787d59b203b444da5 /tools/h5import
parent61346d50fab0dbaadd313e46cc968d4e4ad26c82 (diff)
downloadhdf5-c880943ce9d588a58aecebeb7d2ecf978e02616b.zip
hdf5-c880943ce9d588a58aecebeb7d2ecf978e02616b.tar.gz
hdf5-c880943ce9d588a58aecebeb7d2ecf978e02616b.tar.bz2
[svn-r16490] Fixed bug #1459 by eliminating the macro long_long and replacing all instances with long long.
Tested: h5comittest fedora 10 x64 XP32, VNET
Diffstat (limited to 'tools/h5import')
-rwxr-xr-xtools/h5import/h5import.h2
-rwxr-xr-xtools/h5import/h5importtest.c8
2 files changed, 5 insertions, 5 deletions
diff --git a/tools/h5import/h5import.h b/tools/h5import/h5import.h
index 975ace0..c43b0cf 100755
--- a/tools/h5import/h5import.h
+++ b/tools/h5import/h5import.h
@@ -68,7 +68,7 @@
#define H5DT_UINT8 unsigned char
#define H5DT_UINT16 unsigned short
#define H5DT_UINT32 unsigned int
-#define H5DT_INT64 long_long
+#define H5DT_INT64 long long
#define H5DT_UINT64 unsigned H5DT_INT64
struct path_info
diff --git a/tools/h5import/h5importtest.c b/tools/h5import/h5importtest.c
index 0b0ba9c..718ec6b 100755
--- a/tools/h5import/h5importtest.c
+++ b/tools/h5import/h5importtest.c
@@ -44,10 +44,10 @@ main(void)
int rowi4i = (int)1 , coli4i = (int)2 , plni4i = (int)5 ;
#ifndef WIN32
- long_long b64i2[3][4], b64i3[5][3][4];
- long_long row4i64[3], col4i64[4], pln4i64[5];
- long_long rowo4i64 = (long_long)11 , colo4i64 = (long_long)21 , plno4i64 = (long_long)51 ;
- long_long rowi4i64 = (long_long)1 , coli4i64 = (long_long)2 , plni4i64 = (long_long)5 ;
+ long long b64i2[3][4], b64i3[5][3][4];
+ long long row4i64[3], col4i64[4], pln4i64[5];
+ long long rowo4i64 = (long long)11 , colo4i64 = (long long)21 , plno4i64 = (long long)51 ;
+ long long rowi4i64 = (long long)1 , coli4i64 = (long long)2 , plni4i64 = (long long)5 ;
#endif
short b16i3[5][3][4];