Properly handle PID type in C (#1672)

1 files changed, 38 insertions, 1 deletions

diff --git a/psutil/_psutil_common.h b/psutil/_psutil_common.h
index 92a98b9c..d45cf56b 100644
--- a/psutil/_psutil_common.h
+++ b/psutil/_psutil_common.h
@@ -23,7 +23,43 @@ static const int PSUTIL_CONN_NONE = 128;
     PyObject* PyUnicode_DecodeFSDefault(char *s);
     PyObject* PyUnicode_DecodeFSDefaultAndSize(char *s, Py_ssize_t size);
 #endif
-PyObject* PyErr_SetFromOSErrnoWithSyscall(const char *syscall);
+
+// Python 2: SIZEOF_PID_T not defined but _getpid() returns an int.
+#if defined(PSUTIL_WINDOWS) && !defined(SIZEOF_PID_T)
+    #define SIZEOF_PID_T SIZEOF_INT
+#endif
+
+#if !defined(_Py_PARSE_PID) || PY_MAJOR_VERSION < 3
+    #if !defined(SIZEOF_PID_T) || !defined(SIZEOF_INT) || !defined(SIZEOF_LONG)
+        #error "missing SIZEOF* definition"
+    #endif
+#endif
+
+// _Py_PARSE_PID is Python 3 only, but since it's private make sure it's
+// always present.
+#ifndef _Py_PARSE_PID
+    #if SIZEOF_PID_T == SIZEOF_INT
+        #define _Py_PARSE_PID "i"
+    #elif SIZEOF_PID_T == SIZEOF_LONG
+        #define _Py_PARSE_PID "l"
+    #elif defined(SIZEOF_LONG_LONG) && SIZEOF_PID_T == SIZEOF_LONG_LONG
+        #define _Py_PARSE_PID "L"
+    #else
+        #error "_Py_PARSE_PID: sizeof(pid_t) is neither sizeof(int), "
+               "sizeof(long) or sizeof(long long)"
+    #endif
+#endif
+
+#if PY_MAJOR_VERSION < 3
+    #if ((SIZEOF_PID_T == SIZEOF_INT) || (SIZEOF_PID_T == SIZEOF_LONG))
+        #define PyLong_FromPid PyInt_FromLong
+    #elif defined(SIZEOF_LONG_LONG) && SIZEOF_PID_T == SIZEOF_LONG_LONG
+        #define PyLong_FromPid PyLong_FromLongLong
+    #else
+        #error "PyLong_FromPid: sizeof(pid_t) is neither sizeof(int), "
+               "sizeof(long) or sizeof(long long)"
+    #endif
+#endif
 
 // ====================================================================
 // --- Custom exceptions
@@ -31,6 +67,7 @@ PyObject* PyErr_SetFromOSErrnoWithSyscall(const char *syscall);
 
 PyObject* AccessDenied(const char *msg);
 PyObject* NoSuchProcess(const char *msg);
+PyObject* PyErr_SetFromOSErrnoWithSyscall(const char *syscall);
 
 // ====================================================================
 // --- Global utils