MAINT: As discussed make it two NULL fields at the end of dtype

seberg · seberg · commit 4c38ec2fcb7f · 2024-03-06T19:42:09.000+01:00
2 should work (unless I miscounted badly).
diff --git a/doc/source/reference/c-api/types-and-structures.rst b/doc/source/reference/c-api/types-and-structures.rst
@@ -290,7 +290,7 @@ PyArrayDescr_Type and PyArray_Descr
           npy_intp alignment;
           NpyAuxData *c_metadata;
           npy_hash_t hash;
-          void *reserved_null;  // unused field, must be NULL.
+          void *reserved_null[2];  // unused field, must be NULLed.
       } PyArray_Descr;
 
    Some dtypes have additional members which are accessible through
diff --git a/numpy/_core/include/numpy/ndarraytypes.h b/numpy/_core/include/numpy/ndarraytypes.h
@@ -610,7 +610,7 @@ typedef struct _PyArray_Descr {
         /* Cached hash value (-1 if not yet computed). */
         npy_hash_t hash;
         /* Unused slot (must be initialized to NULL) for future use */
-        void *reserved_null;
+        void *reserved_null[2];
 } PyArray_Descr;
 
 #else  /* 1.x and 2.x compatible version (only shared fields): */
@@ -639,7 +639,7 @@ typedef struct {
         npy_intp alignment;
         PyObject *metadata;
         npy_hash_t hash;
-        void *reserved_null;
+        void *reserved_null[2];
 } _PyArray_DescrNumPy2;
 
 #endif  /* 1.x and 2.x compatible version */
@@ -662,7 +662,7 @@ typedef struct {
         npy_intp alignment;
         PyObject *metadata;
         npy_hash_t hash;
-        void *reserved_null;
+        void *reserved_null[2];
         struct _arr_descr *subarray;
         PyObject *fields;
         PyObject *names;
