mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-02-23 16:20:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r12703] Using int64_t in H5Lpublic.h caused errors on Windows, where int64_t is only

Browse Source 
defined in H5private.h.

Moved definition of int64_t from H5private.h to H5public.h as a temporary
solution.

Tested on heping and Windows (windows also needed H5Gdense.c and H5Gbtree2.c
to be added to hdf5 project).
This commit is contained in:
James Laird 2006-10-02 12:08:28 -05:00
parent 22a3d4b0c9
commit 79bc4a9b03
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/H5private.h
View File

@ -424,22 +424,7 @@
# error "nothing appropriate for uint32_t"
#endif
#if H5_SIZEOF_INT64_T>=8
#elif H5_SIZEOF_INT>=8
typedef int int64_t;
# undef H5_SIZEOF_INT64_T
# define H5_SIZEOF_INT64_T H5_SIZEOF_INT
#elif H5_SIZEOF_LONG>=8
typedef long int64_t;
# undef H5_SIZEOF_INT64_T
# define H5_SIZEOF_INT64_T H5_SIZEOF_LONG
#elif H5_SIZEOF_LONG_LONG>=8
typedef long_long int64_t;
# undef H5_SIZEOF_INT64_T
# define H5_SIZEOF_INT64_T H5_SIZEOF_LONG_LONG
#else
# error "nothing appropriate for int64_t"
#endif
/* Definition of int64_t was moved to H5public.h */
#if H5_SIZEOF_UINT64_T>=8
#elif H5_SIZEOF_INT>=8

20
src/H5public.h
View File

@ -207,6 +207,26 @@ typedef ssize_t hssize_t;
#endif
#define HADDR_MAX (HADDR_UNDEF-1)
/* int64_t type is used for creation order field for links. It may be
* defined in Posix.1g, otherwise it is defined here.
*/
#if H5_SIZEOF_INT64_T>=8
#elif H5_SIZEOF_INT>=8
typedef int int64_t;
# undef H5_SIZEOF_INT64_T
# define H5_SIZEOF_INT64_T H5_SIZEOF_INT
#elif H5_SIZEOF_LONG>=8
typedef long int64_t;
# undef H5_SIZEOF_INT64_T
# define H5_SIZEOF_INT64_T H5_SIZEOF_LONG
#elif H5_SIZEOF_LONG_LONG>=8
typedef long_long int64_t;
# undef H5_SIZEOF_INT64_T
# define H5_SIZEOF_INT64_T H5_SIZEOF_LONG_LONG
#else
# error "nothing appropriate for int64_t"
#endif
/* Common iteration orders */
typedef enum {
H5_ITER_INC, /* Increasing order */