From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Tue, 31 Oct 2017 18:16:07 +0000 (-0700)
Subject: bpo-31893: Fix errors in b9052a0f91d2e83bbc27267247a5920c82b242a3. (GH-4196) (#4201)
X-Git-Tag: v3.6.4rc1~117
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=84e252b79eed94bc9e9175f82191322c89e489ad;p=thirdparty%2FPython%2Fcpython.git

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)
---

diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
index 3b9c4d65c1d2..7e81f1904c0a 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