Merge pull request #320 from python-greenlet/issue308

Internally define PY_SSIZE_T_CLEAN
python-greenlet · Oct 27, 2022 · e679a7d · e679a7d
2 parents 3f67490 + 6c1162c
commit e679a7d
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 3 deletions.
diff --git a/src/greenlet/greenlet.cpp b/src/greenlet/greenlet.cpp
@@ -11,6 +11,7 @@
 #include <exception>
 
 
+#define PY_SSIZE_T_CLEAN
 #include <Python.h>
 #include "structmember.h" // PyMemberDef
 

diff --git a/src/greenlet/greenlet.h b/src/greenlet/greenlet.h
@@ -5,6 +5,7 @@
 #ifndef Py_GREENLETOBJECT_H
 #define Py_GREENLETOBJECT_H
 
+
 #include <Python.h>
 
 #ifdef __cplusplus

diff --git a/src/greenlet/greenlet_allocator.hpp b/src/greenlet/greenlet_allocator.hpp
@@ -1,6 +1,7 @@
 #ifndef GREENLET_ALLOCATOR_HPP
 #define GREENLET_ALLOCATOR_HPP
 
+#define PY_SSIZE_T_CLEAN
 #include <Python.h>
 #include <memory>
 #include "greenlet_compiler_compat.hpp"

diff --git a/src/greenlet/greenlet_cpython_compat.hpp b/src/greenlet/greenlet_cpython_compat.hpp
@@ -6,6 +6,7 @@
  * Helpers for compatibility with multiple versions of CPython.
  */
 
+#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 
 // These enable writing template functions or classes specialized

diff --git a/src/greenlet/greenlet_exceptions.hpp b/src/greenlet/greenlet_exceptions.hpp
@@ -1,6 +1,7 @@
 #ifndef GREENLET_EXCEPTIONS_HPP
 #define GREENLET_EXCEPTIONS_HPP
 
+#define PY_SSIZE_T_CLEAN
 #include <Python.h>
 #include <stdexcept>
 

diff --git a/src/greenlet/greenlet_greenlet.hpp b/src/greenlet/greenlet_greenlet.hpp
@@ -4,8 +4,9 @@
  * Declarations of the core data structures.
 */
 
+#define PY_SSIZE_T_CLEAN
 #include <Python.h>
-//#include "greenlet_internal.hpp"
+
 #include "greenlet_compiler_compat.hpp"
 #include "greenlet_refs.hpp"
 #include "greenlet_cpython_compat.hpp"

diff --git a/src/greenlet/greenlet_internal.hpp b/src/greenlet/greenlet_internal.hpp
@@ -13,6 +13,7 @@
  *
  * C++ templates and inline functions should go here.
  */
+#define PY_SSIZE_T_CLEAN
 #include "greenlet_compiler_compat.hpp"
 #include "greenlet_cpython_compat.hpp"
 #include "greenlet_exceptions.hpp"

diff --git a/src/greenlet/greenlet_refs.hpp b/src/greenlet/greenlet_refs.hpp
@@ -1,6 +1,7 @@
 #ifndef GREENLET_REFS_HPP
 #define GREENLET_REFS_HPP
 
+#define PY_SSIZE_T_CLEAN
 #include <Python.h>
 //#include "greenlet_internal.hpp"
 #include "greenlet_compiler_compat.hpp"
@@ -14,7 +15,7 @@ typedef struct _greenlet PyGreenlet;
 extern PyTypeObject PyGreenlet_Type;
 
 
-#ifndef NDEBUG
+#ifdef  GREENLET_USE_STDIO
 #include <iostream>
 using std::cerr;
 using std::endl;
@@ -243,7 +244,7 @@ namespace greenlet {
         }
     };
 
-#ifndef NDEBUG
+#ifdef GREENLET_USE_STDIO
         template<typename T, TypeChecker TC>
         std::ostream& operator<<(std::ostream& os, const PyObjectPointer<T, TC>& s)
         {