diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2009-02-18 20:02:05 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2009-02-18 20:02:05 (GMT) |
| commit | 5d69e87ff0f4a4c3ce72b69a944b73b46b5c2b7c (patch) | |
| tree | 6bfe2263c050603e228fb929ad236a5069c11fae /tools/h5import | |
| parent | 85dc39846e418b7abd0e0b951f52d474a82eac80 (diff) | |
| download | hdf5-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/h5import')
| -rwxr-xr-x | tools/h5import/h5import.h | 2 | ||||
| -rwxr-xr-x | tools/h5import/h5importtest.c | 8 |
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]; |