diff options
| author | Sean McBride <sean@rogue-research.com> | 2022-01-20 14:38:56 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-20 14:38:56 (GMT) |
| commit | d45124d7085de2771c0157f5d48d71b21a10de1f (patch) | |
| tree | 20f245d0923a196fc24ebeaea1bee22c4f978c46 /src/H5detect.c | |
| parent | dd6ad33c75bf084f08d4e84f92ab997c704b2096 (diff) | |
| download | hdf5-d45124d7085de2771c0157f5d48d71b21a10de1f.zip hdf5-d45124d7085de2771c0157f5d48d71b21a10de1f.tar.gz hdf5-d45124d7085de2771c0157f5d48d71b21a10de1f.tar.bz2 | |
Open bsd fixes (#1195)
Diffstat (limited to 'src/H5detect.c')
| -rw-r--r-- | src/H5detect.c | 32 |
1 files changed, 10 insertions, 22 deletions
diff --git a/src/H5detect.c b/src/H5detect.c index e72d7a0..2b3df90 100644 --- a/src/H5detect.c +++ b/src/H5detect.c @@ -205,15 +205,12 @@ precision(detected_t *d) } /*------------------------------------------------------------------------- - * Function: DETECT_I/DETECT_BYTE + * Function: DETECT_I * - * Purpose: These macro takes a type like `int' and a base name like + * Purpose: This macro takes a type like `int' and a base name like * `nati' and detects the byte order. The VAR is used to * construct the names of the C variables defined. * - * DETECT_I is used for types that are larger than one byte, - * DETECT_BYTE is used for types that are exactly one byte. - * * Return: void * *------------------------------------------------------------------------- @@ -247,17 +244,8 @@ precision(detected_t *d) } \ } -#define DETECT_BYTE(TYPE, VAR, INFO) \ - { \ - HDcompile_assert(sizeof(TYPE) == 1); \ - \ - DETECT_I_BYTE_CORE(TYPE, VAR, INFO, int) \ - } - #define DETECT_I(TYPE, VAR, INFO) \ { \ - HDcompile_assert(sizeof(TYPE) > 1); \ - \ DETECT_I_BYTE_CORE(TYPE, VAR, INFO, TYPE) \ } @@ -1232,9 +1220,9 @@ bit.\n"; static void HDF_NO_UBSAN detect_C89_integers(void) { - DETECT_BYTE(signed char, SCHAR, d_g[nd_g]); + DETECT_I(signed char, SCHAR, d_g[nd_g]); nd_g++; - DETECT_BYTE(unsigned char, UCHAR, d_g[nd_g]); + DETECT_I(unsigned char, UCHAR, d_g[nd_g]); nd_g++; DETECT_I(short, SHORT, d_g[nd_g]); nd_g++; @@ -1278,17 +1266,17 @@ detect_C89_floats(void) static void HDF_NO_UBSAN detect_C99_integers8(void) { - DETECT_BYTE(int8_t, INT8, d_g[nd_g]); + DETECT_I(int8_t, INT8, d_g[nd_g]); nd_g++; - DETECT_BYTE(uint8_t, UINT8, d_g[nd_g]); + DETECT_I(uint8_t, UINT8, d_g[nd_g]); nd_g++; - DETECT_BYTE(int_least8_t, INT_LEAST8, d_g[nd_g]); + DETECT_I(int_least8_t, INT_LEAST8, d_g[nd_g]); nd_g++; - DETECT_BYTE(uint_least8_t, UINT_LEAST8, d_g[nd_g]); + DETECT_I(uint_least8_t, UINT_LEAST8, d_g[nd_g]); nd_g++; - DETECT_BYTE(int_fast8_t, INT_FAST8, d_g[nd_g]); + DETECT_I(int_fast8_t, INT_FAST8, d_g[nd_g]); nd_g++; - DETECT_BYTE(uint_fast8_t, UINT_FAST8, d_g[nd_g]); + DETECT_I(uint_fast8_t, UINT_FAST8, d_g[nd_g]); nd_g++; } |