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

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


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

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

* 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 3b9c4d65c1d..7e81f1904c0 100644
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -1841,12 +1841,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