Add macros for int64_t max etc

python · miss-islington · Apr 29, 2020 · Nov 12, 2019 · Nov 12, 2019 · Nov 12, 2019
commit 4d6ac6ed5362d0fbb61d355e5e2aefd67e5e6048
diff --git a/Include/pyport.h b/Include/pyport.h
@@ -72,10 +72,34 @@ Used in:  Py_SAFE_DOWNCAST
 
 #define PY_UINT32_T uint32_t
 #define PY_UINT64_T uint64_t
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#define PY_UINT32_T_MIN UINT32_MIN
+#define PY_UINT32_T_MAX UINT32_MAX
+#define PY_UINT64_T_MIN UINT64_MIN
+#define PY_UINT64_T_MAX UINT64_MAX
+#else
+#define PY_UINT32_T_MIN 0
+#define PY_UINT32_T_MAX ((uint32_t)-1)
+#define PY_UINT64_T_MIN 0
+#define PY_UINT64_T_MAX ((uint64_t)-1)
+#endif
 
 /* Signed variants of the above */
 #define PY_INT32_T int32_t
 #define PY_INT64_T int64_t
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#define PY_INT32_T_MIN INT32_MIN
+#define PY_INT32_T_MAX INT32_MAX
+#define PY_INT64_T_MIN INT64_MIN
+#define PY_INT64_T_MAX INT64_MAX
+#else
+#define PY_INT32_T_MAX ((int32_t)(((uint32_t)-1)>>1))
+#define PY_INT32_T_MIN (-PY_INT32_T_MAX-1)
+#define PY_INT64_T_MAX ((int64_t)(((uint64_t)-1)>>1))
+#define PY_INT64_T_MIN (-PY_INT64_T_MAX-1)
+#endif
 
 /* If PYLONG_BITS_IN_DIGIT is not defined then we'll use 30-bit digits if all
    the necessary integer types are available, and we're on a 64-bit platform

diff --git a/Modules/_xxsubinterpretersmodule.c b/Modules/_xxsubinterpretersmodule.c
@@ -631,8 +631,13 @@ static int64_t *
 _channelends_list_interpreters(_channelends *ends, int64_t *count, int send)
 {
     int64_t *ids = NULL;
-    int64_t numopen = send ? ends->numsendopen : ends->numrecvopen;
-    if (numopen >= PY_SSIZE_T_MAX) {
+    int64_t numopen;
+
+    assert(ends != NULL);
+    assert(count != NULL);
+    numopen = send ? ends->numsendopen : ends->numrecvopen;
+
+    if (numopen >= PY_INT64_T_MAX) {
         PyErr_SetString(PyExc_RuntimeError,
                         "too many interpreters using the channel");
         goto done;
@@ -1202,7 +1207,7 @@ _channels_list_all(_channels *channels, int64_t *count)
     int64_t *cids = NULL;
     PyThread_acquire_lock(channels->mutex, WAIT_LOCK);
     int64_t numopen = channels->numopen;
-    if (numopen >= PY_SSIZE_T_MAX) {
+    if (numopen >= PY_INT64_T_MAX) {
         PyErr_SetString(PyExc_RuntimeError, "too many channels open");
         goto done;
     }