Combine Py_DEBUG and PYTHON_WITH_PYDEBUG flags

vmuriart · vmuriart · commit a14ff1479bab · 2017-03-03T12:46:23.000-07:00
They both refer to the PyDebug builds but were added at different times. Closes pythonnet#362
diff --git a/src/runtime/interop.cs b/src/runtime/interop.cs
@@ -75,7 +75,7 @@ static ObjectOffset()
         {
             int size = IntPtr.Size;
             var n = 0; // Py_TRACE_REFS add two pointers to PyObject_HEAD
-#if Py_DEBUG
+#if PYTHON_WITH_PYDEBUG
             _ob_next = 0;
             _ob_prev = 1 * size;
             n = 2;
@@ -113,14 +113,14 @@ public static int Size(IntPtr ob)
             {
                 return ExceptionOffset.Size();
             }
-#if Py_DEBUG
+#if PYTHON_WITH_PYDEBUG
             return 6 * IntPtr.Size;
 #else
             return 4 * IntPtr.Size;
 #endif
         }
 
-#if Py_DEBUG
+#if PYTHON_WITH_PYDEBUG
         public static int _ob_next;
         public static int _ob_prev;
 #endif
@@ -185,7 +185,7 @@ static BytesOffset()
 
         /* The *real* layout of a type object when allocated on the heap */
         //typedef struct _heaptypeobject {
-#if Py_DEBUG // #ifdef Py_TRACE_REFS
+#if PYTHON_WITH_PYDEBUG
 /* _PyObject_HEAD_EXTRA defines pointers to support a doubly-linked list of all live heap objects. */
         public static int _ob_next = 0;
         public static int _ob_prev = 0;
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -508,7 +508,7 @@ internal static Type[] PythonArgsToTypeArray(IntPtr arg, bool mangleObjects)
         /// </summary>
         internal static unsafe void XIncref(IntPtr op)
         {
-#if Py_DEBUG
+#if PYTHON_WITH_PYDEBUG
             // according to Python doc, Py_IncRef() is Py_XINCREF()
             Py_IncRef(op);
             return;
@@ -530,7 +530,7 @@ internal static unsafe void XIncref(IntPtr op)
 
         internal static unsafe void XDecref(IntPtr op)
         {
-#if Py_DEBUG
+#if PYTHON_WITH_PYDEBUG
             // Py_DecRef calls Python's Py_DECREF
             // according to Python doc, Py_DecRef() is Py_XDECREF()
             Py_DecRef(op);
@@ -584,7 +584,7 @@ internal static unsafe long Refcount(IntPtr op)
             return 0;
         }
 
-#if Py_DEBUG
+#if PYTHON_WITH_PYDEBUG
         // Py_IncRef and Py_DecRef are taking care of the extra payload
         // in Py_DEBUG builds of Python like _Py_RefTotal
         [DllImport(PythonDll)]
@@ -781,7 +781,7 @@ internal static unsafe IntPtr PyObject_TYPE(IntPtr op)
             {
                 return IntPtr.Zero;
             }
-#if Py_DEBUG
+#if PYTHON_WITH_PYDEBUG
             var n = 3;
 #else
             var n = 1;
