diff options
| author | Jerome Soumagne <jsoumagne@hdfgroup.org> | 2015-08-21 22:44:22 (GMT) |
|---|---|---|
| committer | Jerome Soumagne <jsoumagne@hdfgroup.org> | 2015-08-21 22:44:22 (GMT) |
| commit | ab7d724ffd5749c1e3666fd1be0b92f41613af1e (patch) | |
| tree | f3e820daa24477263f5fc3efd43bf459865f260b /src | |
| parent | 7ce2d52cf69f6f6477e0f16e9d85d67cc54d5949 (diff) | |
| download | hdf5-ab7d724ffd5749c1e3666fd1be0b92f41613af1e.zip hdf5-ab7d724ffd5749c1e3666fd1be0b92f41613af1e.tar.gz hdf5-ab7d724ffd5749c1e3666fd1be0b92f41613af1e.tar.bz2 | |
[svn-r27548] Revert r27545
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5Pgcpl.c | 2 | ||||
| -rw-r--r-- | src/H5T.c | 2 | ||||
| -rw-r--r-- | src/H5config.h.in | 6 | ||||
| -rw-r--r-- | src/H5private.h | 4 | ||||
| -rw-r--r-- | src/H5public.h | 15 |
5 files changed, 5 insertions, 24 deletions
diff --git a/src/H5Pgcpl.c b/src/H5Pgcpl.c index e33fb6e..1e3a278 100644 --- a/src/H5Pgcpl.c +++ b/src/H5Pgcpl.c @@ -690,7 +690,7 @@ H5P__gcrt_link_info_dec(const void **_pp, void *_value) HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "unsigned value can't be decoded") /* Set property to default value */ - memcpy(linfo, &H5G_def_linfo_g, sizeof(H5O_linfo_t)); + *linfo = H5G_def_linfo_g; H5_DECODE_UNSIGNED(*pp, crt_order_flags) @@ -850,7 +850,7 @@ H5T_init_interface(void) H5T_INIT_TYPE(OFFSET,H5T_NATIVE_HERR_g,COPY,native_int,SET,sizeof(herr_t)) /* hbool_t */ - H5T_INIT_TYPE(OFFSET,H5T_NATIVE_HBOOL_g,COPY,native_uint,SET,sizeof(hbool_t)) + H5T_INIT_TYPE(OFFSET,H5T_NATIVE_HBOOL_g,COPY,native_int,SET,sizeof(hbool_t)) /*------------------------------------------------------------ * IEEE Types diff --git a/src/H5config.h.in b/src/H5config.h.in index 96e2df5..ad8dcf9 100644 --- a/src/H5config.h.in +++ b/src/H5config.h.in @@ -293,9 +293,6 @@ /* Define if `struct stat' has the `st_blocks' field */ #undef HAVE_STAT_ST_BLOCKS -/* Define to 1 if you have the <stdbool.h> header file. */ -#undef HAVE_STDBOOL_H - /* Define to 1 if you have the <stddef.h> header file. */ #undef HAVE_STDDEF_H @@ -472,9 +469,6 @@ /* Width for printf() for type `long long' or `__int64', use `ll' */ #undef PRINTF_LL_WIDTH -/* The size of `bool', as computed by sizeof. */ -#undef SIZEOF_BOOL - /* The size of `char', as computed by sizeof. */ #undef SIZEOF_CHAR diff --git a/src/H5private.h b/src/H5private.h index b0880a1..9efd145 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -353,10 +353,10 @@ * HDF Boolean type. */ #ifndef FALSE - #define FALSE false +# define FALSE 0 #endif #ifndef TRUE - #define TRUE true +# define TRUE 1 #endif /* diff --git a/src/H5public.h b/src/H5public.h index 858e67f..1b3711b 100644 --- a/src/H5public.h +++ b/src/H5public.h @@ -141,20 +141,7 @@ typedef int herr_t; * printf("error determining whether data type is committed\n"); * } */ -#ifdef H5_HAVE_STDBOOL_H - #include <stdbool.h> -#else /* H5_HAVE_STDBOOL_H */ - #ifndef __cplusplus - #if defined(H5_SIZEOF_BOOL) && (H5_SIZEOF_BOOL != 0) - #define bool _Bool - #else - #define bool unsigned int - #endif - #define true 1 - #define false 0 - #endif /* __cplusplus */ -#endif /* H5_HAVE_STDBOOL_H */ -typedef bool hbool_t; +typedef unsigned int hbool_t; typedef int htri_t; /* Define the ssize_t type if it not is defined */ |