Merge pull request #13836 from tacaswell/fix_ssize_t

jklymak · tacaswell · commit bf2c5f6037c9 · 2019-10-19T12:31:08.000-04:00
MNT: account for cpython deprecations

The conflicts were due to other changes in the #includes in the
affected files.
diff --git a/src/_macosx.m b/src/_macosx.m
@@ -1,3 +1,4 @@
+#define PY_SSIZE_T_CLEAN
 #include <Cocoa/Cocoa.h>
 #include <ApplicationServices/ApplicationServices.h>
 #include <sys/socket.h>
diff --git a/src/_png.cpp b/src/_png.cpp
@@ -5,7 +5,7 @@
    Undefining _POSIX_C_SOURCE and _XOPEN_SOURCE stops a couple
    of harmless warnings.
 */
-
+#define PY_SSIZE_T_CLEAN
 
 extern "C" {
 #   include <png.h>
diff --git a/src/_tkagg.cpp b/src/_tkagg.cpp
@@ -7,7 +7,7 @@
  * See LICENSE/LICENSE.PIL for details.
  *
  */
-
+#define PY_SSIZE_T_CLEAN
 #include <Python.h>
 #include <cstdlib>
 #include <cstdio>
diff --git a/src/_ttconv.cpp b/src/_ttconv.cpp
@@ -5,7 +5,7 @@
 
   Python wrapper for TrueType conversion library in ../ttconv.
  */
-
+#define PY_SSIZE_T_CLEAN
 #include "mplutils.h"
 
 #include <Python.h>
diff --git a/src/file_compat.h b/src/file_compat.h
@@ -1,6 +1,6 @@
 #ifndef __FILE_COMPAT_H__
 #define __FILE_COMPAT_H__
-
+#define PY_SSIZE_T_CLEAN
 #include <Python.h>
 #include <stdio.h>
 #include "numpy/npy_common.h"
diff --git a/src/mplutils.h b/src/mplutils.h
@@ -4,6 +4,7 @@
 
 #ifndef _MPLUTILS_H
 #define _MPLUTILS_H
+#define PY_SSIZE_T_CLEAN
 
 #if defined(_MSC_VER) && _MSC_VER <= 1600
 typedef unsigned __int8   uint8_t;
diff --git a/src/numpy_cpp.h b/src/numpy_cpp.h
@@ -2,7 +2,7 @@
 
 #ifndef _NUMPY_CPP_H_
 #define _NUMPY_CPP_H_
-
+#define PY_SSIZE_T_CLEAN
 /***************************************************************************
  * This file is based on original work by Mark Wiebe, available at:
  *
diff --git a/src/py_adaptors.h b/src/py_adaptors.h
@@ -2,7 +2,7 @@
 
 #ifndef __PY_ADAPTORS_H__
 #define __PY_ADAPTORS_H__
-
+#define PY_SSIZE_T_CLEAN
 /***************************************************************************
  * This module contains a number of C++ classes that adapt Python data
  * structures to C++ and Agg-friendly interfaces.
diff --git a/src/py_converters.cpp b/src/py_converters.cpp
@@ -1,5 +1,5 @@
 #define NO_IMPORT_ARRAY
-
+#define PY_SSIZE_T_CLEAN
 #include "py_converters.h"
 #include "numpy_cpp.h"
 
diff --git a/src/qhull_wrap.c b/src/qhull_wrap.c
@@ -5,6 +5,7 @@
  * triangulation, construct an instance of the matplotlib.tri.Triangulation
  * class without specifying a triangles array.
  */
+#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "numpy/noprefix.h"
 #include "libqhull/qhull_a.h"

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+#define PY_SSIZE_T_CLEAN`
`1`	`2`	`#include <Cocoa/Cocoa.h>`
`2`	`3`	`#include <ApplicationServices/ApplicationServices.h>`
`3`	`4`	`#include <sys/socket.h>`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* See LICENSE/LICENSE.PIL for details.`
`8`	`8`	`*`
`9`	`9`	`*/`
`10`		`-`
	`10`	`+#define PY_SSIZE_T_CLEAN`
`11`	`11`	`#include <Python.h>`
`12`	`12`	`#include <cstdlib>`
`13`	`13`	`#include <cstdio>`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`#ifndef _NUMPY_CPP_H_`
`4`	`4`	`#define _NUMPY_CPP_H_`
`5`		`-`
	`5`	`+#define PY_SSIZE_T_CLEAN`
`6`	`6`	`/***************************************************************************`
`7`	`7`	`* This file is based on original work by Mark Wiebe, available at:`
`8`	`8`	`*`