Windows support

jhendersonHDF · Jun 25, 2024 · cb91135 · cb91135
1 parent a04fe6c
commit cb91135
Show file tree

Hide file tree

Showing 24 changed files with 782 additions and 732 deletions.
diff --git a/doxygen/examples/tables/predefinedDatatypes.dox b/doxygen/examples/tables/predefinedDatatypes.dox
@@ -525,15 +525,15 @@
 </tr>
 <tr>
 <td>#H5T_NATIVE_FLOAT_COMPLEX</td>
-<td>C-style float _Complex (May be H5I_INVALID_HID if platform doesn't support float _Complex type)</td>
+<td>C-style float _Complex (MSVC _Fcomplex) (May be H5I_INVALID_HID if platform doesn't support float _Complex / _Fcomplex type)</td>
 </tr>
 <tr>
 <td>#H5T_NATIVE_DOUBLE_COMPLEX</td>
-<td>C-style double _Complex (May be H5I_INVALID_HID if platform doesn't support double _Complex type)</td>
+<td>C-style double _Complex (MSVC _Dcomplex) (May be H5I_INVALID_HID if platform doesn't support double _Complex / _Dcomplex type)</td>
 </tr>
 <tr>
 <td>#H5T_NATIVE_LDOUBLE_COMPLEX</td>
-<td>C-style long double _Complex (May be H5I_INVALID_HID if platform doesn't support long double _Complex type)</td>
+<td>C-style long double _Complex (MSVC _Lcomplex) (May be H5I_INVALID_HID if platform doesn't support long double _Complex / _Lcomplex type)</td>
 </tr>
 <tr>
 <td>#H5T_NATIVE_B8</td>

diff --git a/src/H5T.c b/src/H5T.c
@@ -43,10 +43,6 @@
 #include "H5VLprivate.h" /* Virtual Object Layer                     */
 #include "H5VMprivate.h" /* Vectors and arrays                       */
 
-#ifdef H5_HAVE_COMPLEX_NUMBERS
-#include <complex.h>
-#endif
-
 /* Datatype conversion functions */
 #include "H5Tconv_integer.h"
 #include "H5Tconv_float.h"
@@ -618,12 +614,12 @@ double      H5T_NATIVE_DOUBLE_NEG_INF_g  = 0.0;
 long double H5T_NATIVE_LDOUBLE_POS_INF_g = 0.0L;
 long double H5T_NATIVE_LDOUBLE_NEG_INF_g = 0.0L;
 #ifdef H5_HAVE_COMPLEX_NUMBERS
-float _Complex H5T_NATIVE_FLOAT_COMPLEX_POS_INF_g         = 0.0F + 0.0F * (float _Complex)_Complex_I;
-float _Complex H5T_NATIVE_FLOAT_COMPLEX_NEG_INF_g         = 0.0F + 0.0F * (float _Complex)_Complex_I;
-double _Complex H5T_NATIVE_DOUBLE_COMPLEX_POS_INF_g       = 0.0 + 0.0 * (double _Complex)_Complex_I;
-double _Complex H5T_NATIVE_DOUBLE_COMPLEX_NEG_INF_g       = 0.0 + 0.0 * (double _Complex)_Complex_I;
-long double _Complex H5T_NATIVE_LDOUBLE_COMPLEX_POS_INF_g = 0.0L + 0.0L * (long double _Complex)_Complex_I;
-long double _Complex H5T_NATIVE_LDOUBLE_COMPLEX_NEG_INF_g = 0.0L + 0.0L * (long double _Complex)_Complex_I;
+H5_float_complex   H5T_NATIVE_FLOAT_COMPLEX_POS_INF_g   = H5_CMPLXF(0.0F, 0.0F);
+H5_float_complex   H5T_NATIVE_FLOAT_COMPLEX_NEG_INF_g   = H5_CMPLXF(0.0F, 0.0F);
+H5_double_complex  H5T_NATIVE_DOUBLE_COMPLEX_POS_INF_g  = H5_CMPLX(0.0, 0.0);
+H5_double_complex  H5T_NATIVE_DOUBLE_COMPLEX_NEG_INF_g  = H5_CMPLX(0.0, 0.0);
+H5_ldouble_complex H5T_NATIVE_LDOUBLE_COMPLEX_POS_INF_g = H5_CMPLXL(0.0L, 0.0L);
+H5_ldouble_complex H5T_NATIVE_LDOUBLE_COMPLEX_NEG_INF_g = H5_CMPLXL(0.0L, 0.0L);
 #endif
 
 /* Declare the free list for H5T_t's and H5T_shared_t's */
@@ -932,9 +928,9 @@ H5T_init(void)
     H5T_t *native_float16 = NULL; /* Datatype structure for native _Float16 type */
 #endif
 #ifdef H5_HAVE_COMPLEX_NUMBERS
-    H5T_t *native_float_complex   = NULL; /* Datatype structure for native float _Complex type */
-    H5T_t *native_double_complex  = NULL; /* Datatype structure for native double _Complex type */
-    H5T_t *native_ldouble_complex = NULL; /* Datatype structure for native long double _Complex type */
+    H5T_t *native_float_complex   = NULL; /* Datatype structure for native float _Complex / _Fcomplex type */
+    H5T_t *native_double_complex  = NULL; /* Datatype structure for native double _Complex / _Dcomplex type */
+    H5T_t *native_ldouble_complex = NULL; /* Datatype structure for native long double _Complex / _Lcomplex type */
 #endif
     herr_t ret_value = SUCCEED; /* Return value */