[Python-checkins] bpo-31893: Fix errors in b9052a0f91d2e83bbc27267247a5920c82b242a3. (GH-4196) (#4202)

Serhiy Storchaka webhook-mailer at python.org
Tue Oct 31 14:16:14 EDT 2017


https://github.com/python/cpython/commit/e7531e54bf195b8d3ed35b4138901c82f7ed794c
commit: e7531e54bf195b8d3ed35b4138901c82f7ed794c
branch: 2.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2017-10-31T20:16:11+02:00
summary:

bpo-31893: Fix errors in b9052a0f91d2e83bbc27267247a5920c82b242a3. (GH-4196) (#4202)

* Fix a compilation error on FreeBSD.
* Fix the data attribute size on Mac OS X.
(cherry picked from commit 2298fad5ff907dd48ea0fb5c71fa22334ef28c6b)

files:
M Modules/selectmodule.c

diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
index 12601713886..6cd32cd8a93 100644
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -1285,12 +1285,12 @@ static PyTypeObject kqueue_queue_Type;
 #   define FFLAGS_FMT_UNIT  "I"
 #endif
 
-#ifdef __FreeBSD__
-#   define DATA_TYPE        T_INTPTRT
-#   define DATA_FMT_UNIT    INTPTR_FMT_UNIT
-#else
+#if defined(__NetBSD__) || defined(__OpenBSD__)
 #   define DATA_TYPE        T_INT64
 #   define DATA_FMT_UNIT    INT64_FMT_UNIT
+#else
+#   define DATA_TYPE        T_INTPTRT
+#   define DATA_FMT_UNIT    INTPTRT_FMT_UNIT
 #endif
 
 /* Unfortunately, we can't store python objects in udata, because



More information about the Python-checkins mailing list