Move include Python.h to ImagingPlatform

Tests/test_image_access.py

@@ -282,7 +282,7 @@ class TestEmbeddable:
             home = sys.prefix.replace("\\", "\\\\")
             fh.write(
                 f"""
-#include "Python.h"
+#include <Python.h>
 
 int main(int argc, char* argv[])
 {{

src/_imaging.c

@@ -71,9 +71,6 @@
  * See the README file for information on usage and redistribution.
  */
 
-#define PY_SSIZE_T_CLEAN
-#include "Python.h"
-
 #ifdef HAVE_LIBJPEG
 #include "jconfig.h"
 #endif

src/_imagingcms.c

@@ -26,15 +26,11 @@ kevin@cazabon.com\n\
 https://www.cazabon.com\n\
 "
 
-#define PY_SSIZE_T_CLEAN
+#include "libImaging/Imaging.h"  // Include before wchar.h so _GNU_SOURCE is set
-#include "Python.h"  // Include before wchar.h so _GNU_SOURCE is set
-#include "wchar.h"
-#include "datetime.h"
 
-#include "lcms2.h"
+#include <wchar.h>
-#include "libImaging/Imaging.h"
+#include <datetime.h>
-
+#include <lcms2.h>
-#define PYCMSVERSION "1.0.0 pil"
 
 /* version history */
 

src/_imagingft.c

@@ -18,10 +18,8 @@
  * Copyright (c) 1998-2007 by Secret Labs AB
  */
 
-#define PY_SSIZE_T_CLEAN
-#include "Python.h"
-#include "thirdparty/pythoncapi_compat.h"
 #include "libImaging/Imaging.h"
+#include "thirdparty/pythoncapi_compat.h"
 
 #include <ft2build.h>
 #include FT_FREETYPE_H

src/_imagingmath.c

@@ -13,12 +13,10 @@
  * See the README file for information on usage and redistribution.
  */
 
-#include "Python.h"
-
 #include "libImaging/Imaging.h"
 
-#include "math.h"
+#include <math.h>
-#include "float.h"
+#include <float.h>
 
 #define MAX_INT32 2147483647.0
 #define MIN_INT32 -2147483648.0

src/_imagingtk.c

@@ -12,7 +12,6 @@
  * See the README file for information on usage and redistribution.
  */
 
-#include "Python.h"
 #include "libImaging/Imaging.h"
 
 #include "Tk/_tkmini.h"

src/_webp.c

@@ -1,6 +1,5 @@
-#define PY_SSIZE_T_CLEAN
-#include <Python.h>
 #include "libImaging/Imaging.h"
+
 #include <webp/encode.h>
 #include <webp/decode.h>
 #include <webp/types.h>

src/decode.c

@@ -29,11 +29,7 @@
 
 /* FIXME: make these pluggable! */
 
-#define PY_SSIZE_T_CLEAN
-#include "Python.h"
-
 #include "libImaging/Imaging.h"
-
 #include "libImaging/Bit.h"
 #include "libImaging/Bcn.h"
 #include "libImaging/Gif.h"

src/display.c

@@ -22,9 +22,6 @@
  * See the README file for information on usage and redistribution.
  */
 
-#define PY_SSIZE_T_CLEAN
-#include "Python.h"
-
 #include "libImaging/Imaging.h"
 
 /* -------------------------------------------------------------------- */

src/encode.c

@@ -22,11 +22,8 @@
 
 /* FIXME: make these pluggable! */
 
-#define PY_SSIZE_T_CLEAN
-#include "Python.h"
-
-#include "thirdparty/pythoncapi_compat.h"
 #include "libImaging/Imaging.h"
+#include "thirdparty/pythoncapi_compat.h"
 #include "libImaging/Gif.h"
 
 #ifdef HAVE_UNISTD_H

src/libImaging/codec_fd.c

@@ -1,4 +1,3 @@
-#include "Python.h"
 #include "Imaging.h"
 
 Py_ssize_t

src/map.c

@@ -18,8 +18,6 @@
  * FIXME: should move the memory mapping primitives into libImaging!
  */
 
-#include "Python.h"
-
 #include "libImaging/Imaging.h"
 
 /* compatibility wrappers (defined in _imaging.c) */

src/outline.c

@@ -17,8 +17,6 @@
  * See the README file for information on usage and redistribution.
  */
 
-#include "Python.h"
-
 #include "libImaging/Imaging.h"
 
 /* -------------------------------------------------------------------- */

src/path.c

@@ -25,9 +25,8 @@
  * See the README file for information on usage and redistribution.
  */
 
-#include "Python.h"
-#include "thirdparty/pythoncapi_compat.h"
 #include "libImaging/Imaging.h"
+#include "thirdparty/pythoncapi_compat.h"
 
 #include <math.h>