diff options
| author | MuQun Yang <ymuqun@hdfgroup.org> | 2003-08-12 16:39:32 (GMT) |
|---|---|---|
| committer | MuQun Yang <ymuqun@hdfgroup.org> | 2003-08-12 16:39:32 (GMT) |
| commit | a3c2612242ca547a0678295ff3342cdbb9c80d4c (patch) | |
| tree | d95234de3a3cb22f5e78ef936e29b1fe3f16e636 | |
| parent | fc5a04a87285f41f37db16d183fd5cb0ab287950 (diff) | |
| download | hdf5-a3c2612242ca547a0678295ff3342cdbb9c80d4c.zip hdf5-a3c2612242ca547a0678295ff3342cdbb9c80d4c.tar.gz hdf5-a3c2612242ca547a0678295ff3342cdbb9c80d4c.tar.bz2 | |
[svn-r7350] Purpose:
Add a macro "elif" for the defination of haddr_t on windows.
Description:
There are no H5_SIZEOF_LONG_LONG for windows; instead H5_SIZEOF____int64 is used.
So for the following macro ifdef-block:
#if H5_SIZEOF_HADDR_T ==H5_SIZEOF_INT # define H5_PRINTF_HADDR_FMT "%u" #elif H5_SIZEOF_HADDR_T ==H5_SIZEOF_LONG # define H5_PRINTF_HADDR_FMT "%lu" #elif H5_SIZEOF_HADDR_T ==H5_SIZEOF_LONG_LONG # define H5_PRINTF_HADDR_FMT "%"H5_PRINTF_LL_WIDTH"u" #else # error "nothing appropriate for H5_PRINTF_HADDR_FMT" #endif
The error will be generated.
Solution:
Add another "elif H5_SIZEOF_HADDR_T==H5_SIZEOF___INT64" after the last "elif" above so that it
can generate the correct result on windows.
Platforms tested:
Since the change is so small, only test on windows and linux.
Misc. update:
| -rw-r--r-- | src/H5public.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/H5public.h b/src/H5public.h index dec8ef4..cb1413b 100644 --- a/src/H5public.h +++ b/src/H5public.h @@ -204,6 +204,8 @@ typedef ssize_t hssize_t; # define H5_PRINTF_HADDR_FMT "%lu" #elif H5_SIZEOF_HADDR_T ==H5_SIZEOF_LONG_LONG # define H5_PRINTF_HADDR_FMT "%"H5_PRINTF_LL_WIDTH"u" +#elif H5_SIZEOF_HADDR_T ==H5_SIZEOF___INT64 +# define H5_PRINTF_HADDR_FMT "%"H5_PRINTF_LL_WIDTH"u" #else # error "nothing appropriate for H5_PRINTF_HADDR_FMT" #endif |