Merge pull request h5py#2482 from neutrinoceros/rfc/platform_dependent_code

neutrinoceros · web-flow · commit 862eecefc72e · 2024-09-01T18:49:49.000+02:00
diff --git a/h5py/api_types_ext.pxd b/h5py/api_types_ext.pxd
@@ -22,10 +22,12 @@ from libc.time cimport time_t
 
 from libc.stdint cimport int8_t, uint8_t, int16_t, uint16_t, int32_t, uint32_t, int64_t, uint64_t
 
-IF UNAME_SYSNAME != "Windows":
-    cdef extern from "unistd.h":
-        ctypedef long ssize_t
-ELSE:
+cdef extern from *:
+    """
+    #if !(defined(_WIN32) || defined(MS_WINDOWS) || defined(_MSC_VER))
+      #include <unistd.h>
+    #endif
+    """
     ctypedef long ssize_t
 
 # Can't use Cython defs because they keep moving them around
diff --git a/h5py/h5g.pyx b/h5py/h5g.pyx
@@ -14,6 +14,8 @@
 
 include "config.pxi"
 
+import sys
+
 # C-level imports
 from ._objects cimport pdefault
 from .utils cimport emalloc, efree
@@ -25,6 +27,9 @@ from ._errors cimport set_error_handler, err_cookie
 # Python level imports
 from ._objects import phil, with_phil
 
+
+_IS_WINDOWS = sys.platform.startswith("win")
+
 # === Public constants and data structures ====================================
 
 # Enumerated object types for groups "H5G_obj_t"
@@ -389,9 +394,9 @@ cdef class GroupID(ObjectID):
         if statbuf.type != H5G_LINK:
             raise ValueError('"%s" is not a symbolic link.' % name)
 
-        IF UNAME_SYSNAME == "Windows":
+        if _IS_WINDOWS:
             linklen = 2049  # Windows statbuf.linklen seems broken
-        ELSE:
+        else:
             linklen = statbuf.linklen+1
         value = <char*>emalloc(sizeof(char)*linklen)
         try:
diff --git a/h5py/h5t.pyx b/h5py/h5t.pyx
@@ -28,17 +28,23 @@ from .utils cimport  emalloc, efree, require_tuple, convert_dims,\
 
 # Python imports
 import codecs
+import os
 import sys
 from collections import namedtuple
-import sys
 import numpy as np
 from .h5 import get_config
 
 from ._objects import phil, with_phil
 
 cfg = get_config()
 
-DEF MACHINE = UNAME_MACHINE  # processor architecture, provided by Cython
+if sys.platform.startswith("win"):
+    _IS_PPC64 = False
+    _IS_PPC64LE = False
+else:
+    _IS_PPC64 = os.uname() == "ppc64"
+    _IS_PPC64LE = os.uname() == "ppc64le"
+
 cdef char* H5PY_PYTHON_OPAQUE_TAG = "PYTHON:OBJECT"
 
 # === Custom C API ============================================================
@@ -291,12 +297,12 @@ cdef (int, int, int) _correct_float_info(ftype_, finfo):
     maxexp = finfo.maxexp
     minexp = finfo.minexp
     # workaround for numpy's buggy finfo on float128 on ppc64 archs
-    if ftype_ == np.longdouble and MACHINE == 'ppc64':
+    if ftype_ == np.longdouble and _IS_PPC64:
         # values reported by hdf5
         nmant = 116
         maxexp = 1024
         minexp = -1022
-    elif ftype_ == np.longdouble and MACHINE == 'ppc64le':
+    elif ftype_ == np.longdouble and _IS_PPC64LE:
         # values reported by hdf5
         nmant = 52
         maxexp = 1024
