Try to fix a compilation error on 32-bit mode OS/X.

Fixes #2 (maybe).
zopefoundation · May 22, 2013 · a45ebca · a45ebca
1 parent 41c31f7
commit a45ebca
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/BTrees/BTreeModuleTemplate.c b/BTrees/BTreeModuleTemplate.c
@@ -99,11 +99,7 @@ longlong_check(PyObject *ob)
 static PyObject *
 longlong_as_object(PY_LONG_LONG val)
 {
-    static PY_LONG_LONG maxint = 0;
-
-    if (maxint == 0)
-        maxint = INT_GETMAX();
-    if ((val > maxint) || (val < (-maxint-1)))
+    if ((val > LONG_MAX) || (val < LONG_MIN))
         return PyLong_FromLongLong(val);
     return INT_FROM_LONG((long)val);
 }

diff --git a/BTrees/_compat.h b/BTrees/_compat.h
@@ -24,7 +24,6 @@
 #define INT_FROM_LONG(x) PyLong_FromLong(x)
 #define INT_CHECK(x) PyLong_Check(x)
 #define INT_AS_LONG(x) PyLong_AS_LONG(x)
-#define INT_GETMAX(x) 2<<31
 #define TEXT_FROM_STRING PyUnicode_FromString
 #define TEXT_FORMAT PyUnicode_Format
 
@@ -39,7 +38,6 @@
 #define INT_FROM_LONG(x) PyInt_FromLong(x)
 #define INT_CHECK(x) PyInt_Check(x)
 #define INT_AS_LONG(x) PyInt_AS_LONG(x)
-#define INT_GETMAX(x) PyInt_GetMax(x)
 #define TEXT_FROM_STRING PyString_FromString
 #define TEXT_FORMAT PyString_Format
 

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -4,6 +4,8 @@
 4.0.7 (unreleased)
 ------------------
 
+- Issue #2:  compilation error on 32-bit mode of OS/X.
+
 - Test ``PURE_PYTHON`` environment variable support:  if set, the C
   extensions will not be built, imported, or tested.