pull_39, issues_37, debian 13 - gcc 14.2.0 compile error

Author: jeonghanlee

devsupApp/src/dbapi.c

@@ -289,11 +289,11 @@ static struct PyMethodDef dbapimethod[] = {
 
 #if PY_MAJOR_VERSION >= 3
 static struct PyModuleDef dbapimodule = {
-  PyModuleDef_HEAD_INIT,
+    PyModuleDef_HEAD_INIT,
     "devsup._dbapi",
     NULL,
     -1,
-    &dbapimethod
+    dbapimethod
 };
 #endif
 

devsupApp/src/dbfield.c

@@ -40,6 +40,10 @@ static const int dbf2np_map[DBF_MENU+1] = {
     NPY_INT16,   // DBF_MENU
 };
 static PyArray_Descr* dbf2np[DBF_MENU+1];
+#if NPY_ABI_VERSION < 0x02000000
+  #define PyDataType_ELSIZE(descr) ((descr)->elsize)
+  #define PyDataType_SET_ELSIZE(descr, size) (descr)->elsize = size
+#endif
 #endif
 
 typedef struct {
@@ -98,7 +102,7 @@ static PyObject* build_array(PyObject* obj, void *data, unsigned short ftype, un
 
     desc = dbf2np[ftype];
     if(ftype==DBF_STRING) {
-        desc->elsize = MAX_STRING_SIZE;
+        PyDataType_SET_ELSIZE(desc, MAX_STRING_SIZE);
     }
 
     Py_XINCREF(desc);

makehelper.py

@@ -26,15 +26,24 @@
         pass
     out = open(sys.argv[1], 'w')
 
-from distutils.sysconfig import get_config_var, get_python_inc
+if sys.version_info >= (3,10,):
+    from sysconfig import get_config_var, get_path
+    incdirs = [get_path("include")]
+else:
+    from distutils.sysconfig import get_config_var, get_python_inc
+    incdirs = [get_python_inc()]
 
-incdirs = [get_python_inc()]
 libdir = get_config_var('LIBDIR') or ''
 
 have_np='NO'
 try:
-    from numpy.distutils.misc_util import get_numpy_include_dirs
-    incdirs = get_numpy_include_dirs()+incdirs
+    if sys.version_info >= (3,10,):
+        from numpy import get_include
+        numpy_dir = [get_include()]
+    else:
+        from numpy.distutils.misc_util import get_numpy_include_dirs
+        numpy_dir = get_numpy_include_dirs()
+    incdirs = numpy_dir+incdirs
     have_np='YES'
 except ImportError:
     pass