diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/big.c | 2 | ||||
| -rw-r--r-- | test/dtypes.c | 114 | ||||
| -rw-r--r-- | test/h5test.h | 2 | ||||
| -rw-r--r-- | test/tconfig.c | 84 |
4 files changed, 101 insertions, 101 deletions
@@ -18,7 +18,7 @@ const char *FILENAME[] = { #define WRT_SIZE 4*1024 #define FAMILY_SIZE 1024*1024*1024 -#if SIZEOF_LONG_LONG >= 8 +#if H5_SIZEOF_LONG_LONG >= 8 # define GB8LL ((unsigned long_long)8*1024*1024*1024) #else # define GB8LL 0 /*cannot do the test*/ diff --git a/test/dtypes.c b/test/dtypes.c index bcc90c9..d423582 100644 --- a/test/dtypes.c +++ b/test/dtypes.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1997 NCSA + * Copyright (C) 1997-2002 NCSA * All rights reserved. * * Programmer: Robb Matzke <matzke@llnl.gov> @@ -264,19 +264,19 @@ reset_hdf5(void) #endif if (without_hardware_g) h5_no_hwconv(); #ifdef TEST_ALIGNMENT - SET_ALIGNMENT(SCHAR, SIZEOF_CHAR); - SET_ALIGNMENT(UCHAR, SIZEOF_CHAR); - SET_ALIGNMENT(SHORT, SIZEOF_SHORT); - SET_ALIGNMENT(USHORT, SIZEOF_SHORT); - SET_ALIGNMENT(INT, SIZEOF_INT); - SET_ALIGNMENT(UINT, SIZEOF_INT); - SET_ALIGNMENT(LONG, SIZEOF_LONG); - SET_ALIGNMENT(ULONG, SIZEOF_LONG); - SET_ALIGNMENT(LLONG, SIZEOF_LONG_LONG); - SET_ALIGNMENT(ULLONG, SIZEOF_LONG_LONG); - SET_ALIGNMENT(FLOAT, SIZEOF_FLOAT); - SET_ALIGNMENT(DOUBLE, SIZEOF_DOUBLE); - SET_ALIGNMENT(LDOUBLE, SIZEOF_LONG_DOUBLE); + SET_ALIGNMENT(SCHAR, H5_SIZEOF_CHAR); + SET_ALIGNMENT(UCHAR, H5_SIZEOF_CHAR); + SET_ALIGNMENT(SHORT, H5_SIZEOF_SHORT); + SET_ALIGNMENT(USHORT, H5_SIZEOF_SHORT); + SET_ALIGNMENT(INT, H5_SIZEOF_INT); + SET_ALIGNMENT(UINT, H5_SIZEOF_INT); + SET_ALIGNMENT(LONG, H5_SIZEOF_LONG); + SET_ALIGNMENT(ULONG, H5_SIZEOF_LONG); + SET_ALIGNMENT(LLONG, H5_SIZEOF_LONG_LONG); + SET_ALIGNMENT(ULLONG, H5_SIZEOF_LONG_LONG); + SET_ALIGNMENT(FLOAT, H5_SIZEOF_FLOAT); + SET_ALIGNMENT(DOUBLE, H5_SIZEOF_DOUBLE); + SET_ALIGNMENT(LDOUBLE, H5_SIZEOF_LONG_DOUBLE); #endif } @@ -3223,12 +3223,12 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst) break; case INT_LLONG: memcpy(aligned, saved+j*sizeof(long_long), sizeof(long_long)); - HDfprintf(stdout," %29"PRINTF_LL_WIDTH"d\n", *((long_long*)aligned)); + HDfprintf(stdout," %29"H5_PRINTF_LL_WIDTH"d\n", *((long_long*)aligned)); break; case INT_ULLONG: memcpy(aligned, saved+j*sizeof(long_long), sizeof(unsigned long_long)); - HDfprintf(stdout," %29"PRINTF_LL_WIDTH"u\n", + HDfprintf(stdout," %29"H5_PRINTF_LL_WIDTH"u\n", *((unsigned long_long*)aligned)); break; case INT_OTHER: @@ -3276,12 +3276,12 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst) break; case INT_LLONG: memcpy(aligned, buf+j*sizeof(long_long), sizeof(long_long)); - HDfprintf(stdout," %29"PRINTF_LL_WIDTH"d\n", *((long_long*)aligned)); + HDfprintf(stdout," %29"H5_PRINTF_LL_WIDTH"d\n", *((long_long*)aligned)); break; case INT_ULLONG: memcpy(aligned, buf+j*sizeof(long_long), sizeof(unsigned long_long)); - HDfprintf(stdout," %29"PRINTF_LL_WIDTH"u\n", + HDfprintf(stdout," %29"H5_PRINTF_LL_WIDTH"u\n", *((unsigned long_long*)aligned)); break; case INT_OTHER: @@ -3320,10 +3320,10 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst) printf(" %29lu\n", *((unsigned long*)hw)); break; case INT_LLONG: - HDfprintf(stdout," %29"PRINTF_LL_WIDTH"d\n", *((long_long*)hw)); + HDfprintf(stdout," %29"H5_PRINTF_LL_WIDTH"d\n", *((long_long*)hw)); break; case INT_ULLONG: - HDfprintf(stdout," %29"PRINTF_LL_WIDTH"u\n", *((unsigned long_long*)hw)); + HDfprintf(stdout," %29"H5_PRINTF_LL_WIDTH"u\n", *((unsigned long_long*)hw)); break; case INT_OTHER: break; @@ -3442,7 +3442,7 @@ my_isnan(flt_t type, void *val) double x; memcpy(&x, val, sizeof(double)); retval = (x!=x); -#if SIZEOF_LONG_DOUBLE!=SIZEOF_DOUBLE +#if H5_SIZEOF_LONG_DOUBLE!=H5_SIZEOF_DOUBLE } else if (FLT_LDOUBLE==type) { long double x; memcpy(&x, val, sizeof(long double)); @@ -3465,7 +3465,7 @@ my_isnan(flt_t type, void *val) double x; memcpy(&x, val, sizeof(double)); sprintf(s, "%g", x); -#if SIZEOF_LONG_DOUBLE!=SIZEOF_DOUBLE +#if H5_SIZEOF_LONG_DOUBLE!=H5_SIZEOF_DOUBLE } else if (FLT_LDOUBLE==type) { long double x; memcpy(&x, val, sizeof(long double)); @@ -3519,7 +3519,7 @@ test_conv_flt_1 (const char *name, hid_t src, hid_t dst) float hw_f; /*hardware-converted */ double hw_d; /*hardware-converted */ void *aligned=NULL; /*aligned buffer */ -#if SIZEOF_LONG_DOUBLE!=SIZEOF_DOUBLE +#if H5_SIZEOF_LONG_DOUBLE!=H5_SIZEOF_DOUBLE long double hw_ld; /*hardware-converted */ #endif unsigned char *hw=NULL; /*ptr to hardware-conv'd*/ @@ -3569,7 +3569,7 @@ test_conv_flt_1 (const char *name, hid_t src, hid_t dst) } else if (H5Tequal(src, H5T_NATIVE_DOUBLE)) { src_type_name = "double"; src_type = FLT_DOUBLE; -#if SIZEOF_LONG_DOUBLE!=SIZEOF_DOUBLE +#if H5_SIZEOF_LONG_DOUBLE!=H5_SIZEOF_DOUBLE } else if (H5Tequal(src, H5T_NATIVE_LDOUBLE)) { src_type_name = "long double"; src_type = FLT_LDOUBLE; @@ -3585,7 +3585,7 @@ test_conv_flt_1 (const char *name, hid_t src, hid_t dst) } else if (H5Tequal(dst, H5T_NATIVE_DOUBLE)) { dst_type_name = "double"; dst_type = FLT_DOUBLE; -#if SIZEOF_LONG_DOUBLE!=SIZEOF_DOUBLE +#if H5_SIZEOF_LONG_DOUBLE!=H5_SIZEOF_DOUBLE } else if (H5Tequal(dst, H5T_NATIVE_LDOUBLE)) { dst_type_name = "long double"; dst_type = FLT_LDOUBLE; @@ -3645,7 +3645,7 @@ test_conv_flt_1 (const char *name, hid_t src, hid_t dst) } else { for (j=0; j<nelmts; j++) { /* Do it this way for alignment reasons */ -#if SIZEOF_LONG_DOUBLE!=SIZEOF_DOUBLE +#if H5_SIZEOF_LONG_DOUBLE!=H5_SIZEOF_DOUBLE long double temp[1]; #else double temp[1]; @@ -3659,7 +3659,7 @@ test_conv_flt_1 (const char *name, hid_t src, hid_t dst) if (FLT_DOUBLE==src_type && FLT_FLOAT==dst_type) { hw_d = *((float*)temp); memcpy(buf+j*src_size, &hw_d, src_size); -#if SIZEOF_LONG_DOUBLE!=SIZEOF_DOUBLE +#if H5_SIZEOF_LONG_DOUBLE!=H5_SIZEOF_DOUBLE } else if (FLT_LDOUBLE==src_type && FLT_FLOAT==dst_type) { hw_ld = *((float*)temp); memcpy(buf+j*src_size, &hw_ld, src_size); @@ -3680,7 +3680,7 @@ test_conv_flt_1 (const char *name, hid_t src, hid_t dst) for (j=0; j<nelmts; j++) { hw_f = 911.0; hw_d = 911.0; -#if SIZEOF_LONG_DOUBLE!=SIZEOF_DOUBLE +#if H5_SIZEOF_LONG_DOUBLE!=H5_SIZEOF_DOUBLE hw_ld = 911.0; #endif @@ -3693,7 +3693,7 @@ test_conv_flt_1 (const char *name, hid_t src, hid_t dst) } else if (FLT_DOUBLE==dst_type) { hw_d = *((float*)aligned); hw = (unsigned char*)&hw_d; -#if SIZEOF_LONG_DOUBLE!=SIZEOF_DOUBLE +#if H5_SIZEOF_LONG_DOUBLE!=H5_SIZEOF_DOUBLE } else { hw_ld = *((float*)aligned); hw = (unsigned char*)&hw_ld; @@ -3707,13 +3707,13 @@ test_conv_flt_1 (const char *name, hid_t src, hid_t dst) } else if (FLT_DOUBLE==dst_type) { hw_d = *((double*)aligned); hw = (unsigned char*)&hw_d; -#if SIZEOF_LONG_DOUBLE!=SIZEOF_DOUBLE +#if H5_SIZEOF_LONG_DOUBLE!=H5_SIZEOF_DOUBLE } else { hw_ld = *((double*)aligned); hw = (unsigned char*)&hw_ld; #endif } -#if SIZEOF_LONG_DOUBLE!=SIZEOF_DOUBLE +#if H5_SIZEOF_LONG_DOUBLE!=H5_SIZEOF_DOUBLE } else { memcpy(aligned, saved+j*sizeof(long double), sizeof(long double)); @@ -3751,7 +3751,7 @@ test_conv_flt_1 (const char *name, hid_t src, hid_t dst) my_isnan(dst_type, (double*)buf+j) && my_isnan(dst_type, hw)) { continue; -#if SIZEOF_LONG_DOUBLE!=SIZEOF_DOUBLE +#if H5_SIZEOF_LONG_DOUBLE!=H5_SIZEOF_DOUBLE } else if (FLT_LDOUBLE==dst_type && my_isnan(dst_type, (long double*)buf+j) && my_isnan(dst_type, hw)) { @@ -3790,7 +3790,7 @@ test_conv_flt_1 (const char *name, hid_t src, hid_t dst) memcpy(&x, (double*)buf+j, sizeof(double)); check_mant[0] = frexp(x, check_expo+0); check_mant[1] = frexp(((double*)hw)[0], check_expo+1); -#if SIZEOF_LONG_DOUBLE!=SIZEOF_DOUBLE +#if H5_SIZEOF_LONG_DOUBLE!=H5_SIZEOF_DOUBLE } else { long double x; memcpy(&x, (long double*)buf+j, sizeof(long double)); @@ -3822,7 +3822,7 @@ test_conv_flt_1 (const char *name, hid_t src, hid_t dst) double x; memcpy(&x, (double*)saved+j, sizeof(double)); printf(" %29.20e\n", x); -#if SIZEOF_LONG_DOUBLE!=SIZEOF_DOUBLE +#if H5_SIZEOF_LONG_DOUBLE!=H5_SIZEOF_DOUBLE } else { long double x; memcpy(&x, (long double*)saved+j, sizeof(long double)); @@ -3844,7 +3844,7 @@ test_conv_flt_1 (const char *name, hid_t src, hid_t dst) double x; memcpy(&x, (double*)buf+j, sizeof(double)); printf(" %29.20e\n", x); -#if SIZEOF_LONG_DOUBLE!=SIZEOF_DOUBLE +#if H5_SIZEOF_LONG_DOUBLE!=H5_SIZEOF_DOUBLE } else { long double x; memcpy(&x, (long double*)buf+j, sizeof(long double)); @@ -3862,7 +3862,7 @@ test_conv_flt_1 (const char *name, hid_t src, hid_t dst) printf(" %29.20e\n", hw_f); } else if (FLT_DOUBLE==dst_type) { printf(" %29.20e\n", hw_d); -#if SIZEOF_LONG_DOUBLE!=SIZEOF_DOUBLE +#if H5_SIZEOF_LONG_DOUBLE!=H5_SIZEOF_DOUBLE } else { HDfprintf(stdout," %29.20Le\n", hw_ld); #endif @@ -3932,11 +3932,11 @@ run_integer_tests(const char *name) nerrors += test_conv_int_1(name, H5T_NATIVE_SCHAR, H5T_NATIVE_USHORT); nerrors += test_conv_int_1(name, H5T_NATIVE_SCHAR, H5T_NATIVE_INT); nerrors += test_conv_int_1(name, H5T_NATIVE_SCHAR, H5T_NATIVE_UINT); -#if SIZEOF_LONG!=SIZEOF_INT +#if H5_SIZEOF_LONG!=H5_SIZEOF_INT nerrors += test_conv_int_1(name, H5T_NATIVE_SCHAR, H5T_NATIVE_LONG); nerrors += test_conv_int_1(name, H5T_NATIVE_SCHAR, H5T_NATIVE_ULONG); #endif -#if SIZEOF_LONG_LONG!=SIZEOF_LONG +#if H5_SIZEOF_LONG_LONG!=H5_SIZEOF_LONG nerrors += test_conv_int_1(name, H5T_NATIVE_SCHAR, H5T_NATIVE_LLONG); nerrors += test_conv_int_1(name, H5T_NATIVE_SCHAR, H5T_NATIVE_ULLONG); #endif @@ -3946,11 +3946,11 @@ run_integer_tests(const char *name) nerrors += test_conv_int_1(name, H5T_NATIVE_UCHAR, H5T_NATIVE_USHORT); nerrors += test_conv_int_1(name, H5T_NATIVE_UCHAR, H5T_NATIVE_INT); nerrors += test_conv_int_1(name, H5T_NATIVE_UCHAR, H5T_NATIVE_UINT); -#if SIZEOF_LONG!=SIZEOF_INT +#if H5_SIZEOF_LONG!=H5_SIZEOF_INT nerrors += test_conv_int_1(name, H5T_NATIVE_UCHAR, H5T_NATIVE_LONG); nerrors += test_conv_int_1(name, H5T_NATIVE_UCHAR, H5T_NATIVE_ULONG); #endif -#if SIZEOF_LONG_LONG!=SIZEOF_LONG +#if H5_SIZEOF_LONG_LONG!=H5_SIZEOF_LONG nerrors += test_conv_int_1(name, H5T_NATIVE_UCHAR, H5T_NATIVE_LLONG); nerrors += test_conv_int_1(name, H5T_NATIVE_UCHAR, H5T_NATIVE_ULLONG); #endif @@ -3960,11 +3960,11 @@ run_integer_tests(const char *name) nerrors += test_conv_int_1(name, H5T_NATIVE_SHORT, H5T_NATIVE_USHORT); nerrors += test_conv_int_1(name, H5T_NATIVE_SHORT, H5T_NATIVE_INT); nerrors += test_conv_int_1(name, H5T_NATIVE_SHORT, H5T_NATIVE_UINT); -#if SIZEOF_LONG!=SIZEOF_INT +#if H5_SIZEOF_LONG!=H5_SIZEOF_INT nerrors += test_conv_int_1(name, H5T_NATIVE_SHORT, H5T_NATIVE_LONG); nerrors += test_conv_int_1(name, H5T_NATIVE_SHORT, H5T_NATIVE_ULONG); #endif -#if SIZEOF_LONG_LONG!=SIZEOF_LONG +#if H5_SIZEOF_LONG_LONG!=H5_SIZEOF_LONG nerrors += test_conv_int_1(name, H5T_NATIVE_SHORT, H5T_NATIVE_LLONG); nerrors += test_conv_int_1(name, H5T_NATIVE_SHORT, H5T_NATIVE_ULLONG); #endif @@ -3974,11 +3974,11 @@ run_integer_tests(const char *name) nerrors += test_conv_int_1(name, H5T_NATIVE_USHORT, H5T_NATIVE_SHORT); nerrors += test_conv_int_1(name, H5T_NATIVE_USHORT, H5T_NATIVE_INT); nerrors += test_conv_int_1(name, H5T_NATIVE_USHORT, H5T_NATIVE_UINT); -#if SIZEOF_LONG!=SIZEOF_INT +#if H5_SIZEOF_LONG!=H5_SIZEOF_INT nerrors += test_conv_int_1(name, H5T_NATIVE_USHORT, H5T_NATIVE_LONG); nerrors += test_conv_int_1(name, H5T_NATIVE_USHORT, H5T_NATIVE_ULONG); #endif -#if SIZEOF_LONG_LONG!=SIZEOF_LONG +#if H5_SIZEOF_LONG_LONG!=H5_SIZEOF_LONG nerrors += test_conv_int_1(name, H5T_NATIVE_USHORT, H5T_NATIVE_LLONG); nerrors += test_conv_int_1(name, H5T_NATIVE_USHORT, H5T_NATIVE_ULLONG); #endif @@ -3988,11 +3988,11 @@ run_integer_tests(const char *name) nerrors += test_conv_int_1(name, H5T_NATIVE_INT, H5T_NATIVE_SHORT); nerrors += test_conv_int_1(name, H5T_NATIVE_INT, H5T_NATIVE_USHORT); nerrors += test_conv_int_1(name, H5T_NATIVE_INT, H5T_NATIVE_UINT); -#if SIZEOF_LONG!=SIZEOF_INT +#if H5_SIZEOF_LONG!=H5_SIZEOF_INT nerrors += test_conv_int_1(name, H5T_NATIVE_INT, H5T_NATIVE_LONG); nerrors += test_conv_int_1(name, H5T_NATIVE_INT, H5T_NATIVE_ULONG); #endif -#if SIZEOF_LONG_LONG!=SIZEOF_LONG +#if H5_SIZEOF_LONG_LONG!=H5_SIZEOF_LONG nerrors += test_conv_int_1(name, H5T_NATIVE_INT, H5T_NATIVE_LLONG); nerrors += test_conv_int_1(name, H5T_NATIVE_INT, H5T_NATIVE_ULLONG); #endif @@ -4002,16 +4002,16 @@ run_integer_tests(const char *name) nerrors += test_conv_int_1(name, H5T_NATIVE_UINT, H5T_NATIVE_SHORT); nerrors += test_conv_int_1(name, H5T_NATIVE_UINT, H5T_NATIVE_USHORT); nerrors += test_conv_int_1(name, H5T_NATIVE_UINT, H5T_NATIVE_INT); -#if SIZEOF_LONG!=SIZEOF_INT +#if H5_SIZEOF_LONG!=H5_SIZEOF_INT nerrors += test_conv_int_1(name, H5T_NATIVE_UINT, H5T_NATIVE_LONG); nerrors += test_conv_int_1(name, H5T_NATIVE_UINT, H5T_NATIVE_ULONG); #endif -#if SIZEOF_LONG_LONG!=SIZEOF_LONG +#if H5_SIZEOF_LONG_LONG!=H5_SIZEOF_LONG nerrors += test_conv_int_1(name, H5T_NATIVE_UINT, H5T_NATIVE_LLONG); nerrors += test_conv_int_1(name, H5T_NATIVE_UINT, H5T_NATIVE_ULLONG); #endif -#if SIZEOF_LONG!=SIZEOF_INT +#if H5_SIZEOF_LONG!=H5_SIZEOF_INT nerrors += test_conv_int_1(name, H5T_NATIVE_LONG, H5T_NATIVE_SCHAR); nerrors += test_conv_int_1(name, H5T_NATIVE_LONG, H5T_NATIVE_UCHAR); nerrors += test_conv_int_1(name, H5T_NATIVE_LONG, H5T_NATIVE_SHORT); @@ -4019,13 +4019,13 @@ run_integer_tests(const char *name) nerrors += test_conv_int_1(name, H5T_NATIVE_LONG, H5T_NATIVE_INT); nerrors += test_conv_int_1(name, H5T_NATIVE_LONG, H5T_NATIVE_UINT); nerrors += test_conv_int_1(name, H5T_NATIVE_LONG, H5T_NATIVE_ULONG); -#if SIZEOF_LONG_LONG!=SIZEOF_LONG +#if H5_SIZEOF_LONG_LONG!=H5_SIZEOF_LONG nerrors += test_conv_int_1(name, H5T_NATIVE_LONG, H5T_NATIVE_LLONG); nerrors += test_conv_int_1(name, H5T_NATIVE_LONG, H5T_NATIVE_ULLONG); #endif #endif -#if SIZEOF_LONG!=SIZEOF_INT +#if H5_SIZEOF_LONG!=H5_SIZEOF_INT nerrors += test_conv_int_1(name, H5T_NATIVE_ULONG, H5T_NATIVE_SCHAR); nerrors += test_conv_int_1(name, H5T_NATIVE_ULONG, H5T_NATIVE_UCHAR); nerrors += test_conv_int_1(name, H5T_NATIVE_ULONG, H5T_NATIVE_SHORT); @@ -4033,34 +4033,34 @@ run_integer_tests(const char *name) nerrors += test_conv_int_1(name, H5T_NATIVE_ULONG, H5T_NATIVE_INT); nerrors += test_conv_int_1(name, H5T_NATIVE_ULONG, H5T_NATIVE_UINT); nerrors += test_conv_int_1(name, H5T_NATIVE_ULONG, H5T_NATIVE_LONG); -#if SIZEOF_LONG_LONG!=SIZEOF_LONG +#if H5_SIZEOF_LONG_LONG!=H5_SIZEOF_LONG nerrors += test_conv_int_1(name, H5T_NATIVE_ULONG, H5T_NATIVE_LLONG); nerrors += test_conv_int_1(name, H5T_NATIVE_ULONG, H5T_NATIVE_ULLONG); #endif #endif -#if SIZEOF_LONG_LONG!=SIZEOF_LONG +#if H5_SIZEOF_LONG_LONG!=H5_SIZEOF_LONG nerrors += test_conv_int_1(name, H5T_NATIVE_LLONG, H5T_NATIVE_SCHAR); nerrors += test_conv_int_1(name, H5T_NATIVE_LLONG, H5T_NATIVE_UCHAR); nerrors += test_conv_int_1(name, H5T_NATIVE_LLONG, H5T_NATIVE_SHORT); nerrors += test_conv_int_1(name, H5T_NATIVE_LLONG, H5T_NATIVE_USHORT); nerrors += test_conv_int_1(name, H5T_NATIVE_LLONG, H5T_NATIVE_INT); nerrors += test_conv_int_1(name, H5T_NATIVE_LLONG, H5T_NATIVE_UINT); -#if SIZEOF_LONG!=SIZEOF_INT +#if H5_SIZEOF_LONG!=H5_SIZEOF_INT nerrors += test_conv_int_1(name, H5T_NATIVE_LLONG, H5T_NATIVE_LONG); nerrors += test_conv_int_1(name, H5T_NATIVE_LLONG, H5T_NATIVE_ULONG); #endif nerrors += test_conv_int_1(name, H5T_NATIVE_LLONG, H5T_NATIVE_ULLONG); #endif -#if SIZEOF_LONG_LONG!=SIZEOF_LONG +#if H5_SIZEOF_LONG_LONG!=H5_SIZEOF_LONG nerrors += test_conv_int_1(name, H5T_NATIVE_ULLONG, H5T_NATIVE_SCHAR); nerrors += test_conv_int_1(name, H5T_NATIVE_ULLONG, H5T_NATIVE_UCHAR); nerrors += test_conv_int_1(name, H5T_NATIVE_ULLONG, H5T_NATIVE_SHORT); nerrors += test_conv_int_1(name, H5T_NATIVE_ULLONG, H5T_NATIVE_USHORT); nerrors += test_conv_int_1(name, H5T_NATIVE_ULLONG, H5T_NATIVE_INT); nerrors += test_conv_int_1(name, H5T_NATIVE_ULLONG, H5T_NATIVE_UINT); -#if SIZEOF_LONG!=SIZEOF_INT +#if H5_SIZEOF_LONG!=H5_SIZEOF_INT nerrors += test_conv_int_1(name, H5T_NATIVE_ULLONG, H5T_NATIVE_LONG); nerrors += test_conv_int_1(name, H5T_NATIVE_ULLONG, H5T_NATIVE_ULONG); #endif @@ -4152,7 +4152,7 @@ main(void) /* Test software floating-point conversion functions */ nerrors += test_conv_flt_1("sw", H5T_NATIVE_FLOAT, H5T_NATIVE_DOUBLE); nerrors += test_conv_flt_1("sw", H5T_NATIVE_DOUBLE, H5T_NATIVE_FLOAT); -#if SIZEOF_LONG_DOUBLE!=SIZEOF_DOUBLE +#if H5_SIZEOF_LONG_DOUBLE!=H5_SIZEOF_DOUBLE nerrors += test_conv_flt_1("sw", H5T_NATIVE_FLOAT, H5T_NATIVE_LDOUBLE); nerrors += test_conv_flt_1("sw", H5T_NATIVE_DOUBLE, H5T_NATIVE_LDOUBLE); nerrors += test_conv_flt_1("sw", H5T_NATIVE_LDOUBLE, H5T_NATIVE_FLOAT); diff --git a/test/h5test.h b/test/h5test.h index cc627ab..2240531 100644 --- a/test/h5test.h +++ b/test/h5test.h @@ -14,7 +14,7 @@ #include "hdf5.h" #include "H5private.h" -#ifdef STDC_HEADERS +#ifdef H5_STDC_HEADERS # include <signal.h> #endif diff --git a/test/tconfig.c b/test/tconfig.c index 8ed2a31..047097d 100644 --- a/test/tconfig.c +++ b/test/tconfig.c @@ -100,85 +100,85 @@ void test_config_ctypes(void) { /* standard basic types */ - vrfy_ctype(char, SIZEOF_CHAR); - vrfy_ctype(int, SIZEOF_INT); - vrfy_ctype(short, SIZEOF_SHORT); - vrfy_ctype(long, SIZEOF_LONG); - vrfy_ctype(float, SIZEOF_FLOAT); - vrfy_ctype(double, SIZEOF_DOUBLE); + vrfy_ctype(char, H5_SIZEOF_CHAR); + vrfy_ctype(int, H5_SIZEOF_INT); + vrfy_ctype(short, H5_SIZEOF_SHORT); + vrfy_ctype(long, H5_SIZEOF_LONG); + vrfy_ctype(float, H5_SIZEOF_FLOAT); + vrfy_ctype(double, H5_SIZEOF_DOUBLE); /* non-standard basic types */ -#if SIZEOF_LONG_LONG > 0 - vrfy_ctype(long_long, SIZEOF_LONG_LONG); +#if H5_SIZEOF_LONG_LONG > 0 + vrfy_ctype(long_long, H5_SIZEOF_LONG_LONG); #endif -#if SIZEOF_LONG_DOUBLE > 0 - vrfy_ctype(long double, SIZEOF_LONG_DOUBLE); +#if H5_SIZEOF_LONG_DOUBLE > 0 + vrfy_ctype(long double, H5_SIZEOF_LONG_DOUBLE); #endif -#if SIZEOF_UINT8_T > 0 - vrfy_ctype(uint8_t, SIZEOF_UINT8_T); +#if H5_SIZEOF_UINT8_T > 0 + vrfy_ctype(uint8_t, H5_SIZEOF_UINT8_T); #endif -#if SIZEOF_UINT16_T > 0 - vrfy_ctype(uint16_t, SIZEOF_UINT16_T); +#if H5_SIZEOF_UINT16_T > 0 + vrfy_ctype(uint16_t, H5_SIZEOF_UINT16_T); #endif -#if SIZEOF_UINT32_T > 0 - vrfy_ctype(uint32_t, SIZEOF_UINT32_T); +#if H5_SIZEOF_UINT32_T > 0 + vrfy_ctype(uint32_t, H5_SIZEOF_UINT32_T); #endif -#if SIZEOF_UINT64_T > 0 - vrfy_ctype(uint64_t, SIZEOF_UINT64_T); +#if H5_SIZEOF_UINT64_T > 0 + vrfy_ctype(uint64_t, H5_SIZEOF_UINT64_T); #endif -#if SIZEOF_UINT_FAST8_T > 0 - vrfy_ctype(uint_fast8_t, SIZEOF_UINT_FAST8_T); +#if H5_SIZEOF_UINT_FAST8_T > 0 + vrfy_ctype(uint_fast8_t, H5_SIZEOF_UINT_FAST8_T); #endif -#if SIZEOF_UINT_FAST16_T > 0 - vrfy_ctype(uint_fast16_t, SIZEOF_UINT_FAST16_T); +#if H5_SIZEOF_UINT_FAST16_T > 0 + vrfy_ctype(uint_fast16_t, H5_SIZEOF_UINT_FAST16_T); #endif -#if SIZEOF_UINT_FAST32_T > 0 - vrfy_ctype(uint_fast32_t, SIZEOF_UINT_FAST32_T); +#if H5_SIZEOF_UINT_FAST32_T > 0 + vrfy_ctype(uint_fast32_t, H5_SIZEOF_UINT_FAST32_T); #endif -#if SIZEOF_UINT_FAST64_T > 0 - vrfy_ctype(uint_fast64_t, SIZEOF_UINT_FAST64_T); +#if H5_SIZEOF_UINT_FAST64_T > 0 + vrfy_ctype(uint_fast64_t, H5_SIZEOF_UINT_FAST64_T); #endif -#if SIZEOF_UINT_LEAST8_T > 0 - vrfy_ctype(uint_least8_t, SIZEOF_UINT_LEAST8_T); +#if H5_SIZEOF_UINT_LEAST8_T > 0 + vrfy_ctype(uint_least8_t, H5_SIZEOF_UINT_LEAST8_T); #endif -#if SIZEOF_UINT_LEAST16_T > 0 - vrfy_ctype(uint_least16_t, SIZEOF_UINT_LEAST16_T); +#if H5_SIZEOF_UINT_LEAST16_T > 0 + vrfy_ctype(uint_least16_t, H5_SIZEOF_UINT_LEAST16_T); #endif -#if SIZEOF_UINT_LEAST32_T > 0 - vrfy_ctype(uint_least32_t, SIZEOF_UINT_LEAST32_T); +#if H5_SIZEOF_UINT_LEAST32_T > 0 + vrfy_ctype(uint_least32_t, H5_SIZEOF_UINT_LEAST32_T); #endif -#if SIZEOF_UINT_LEAST64_T > 0 - vrfy_ctype(uint_least64_t, SIZEOF_UINT_LEAST64_T); +#if H5_SIZEOF_UINT_LEAST64_T > 0 + vrfy_ctype(uint_least64_t, H5_SIZEOF_UINT_LEAST64_T); #endif /* pseudo standard basic types */ -#if SIZEOF___INT64 > 0 - vrfy_ctype(__int64, SIZEOF___INT64); +#if H5_SIZEOF___INT64 > 0 + vrfy_ctype(__int64, H5_SIZEOF___INT64); #endif -#if SIZEOF_OFF_T > 0 - vrfy_ctype(off_t, SIZEOF_OFF_T); +#if H5_SIZEOF_OFF_T > 0 + vrfy_ctype(off_t, H5_SIZEOF_OFF_T); #endif -#if SIZEOF_SIZE_T > 0 - vrfy_ctype(size_t, SIZEOF_SIZE_T); +#if H5_SIZEOF_SIZE_T > 0 + vrfy_ctype(size_t, H5_SIZEOF_SIZE_T); #endif -#if SIZEOF_SSIZE_T > 0 - vrfy_ctype(ssize_t, SIZEOF_SSIZE_T); +#if H5_SIZEOF_SSIZE_T > 0 + vrfy_ctype(ssize_t, H5_SIZEOF_SSIZE_T); #endif } |