HAVE_LIMITS_H -- raise #error if not defined; limits.h is std C

ULONG_MAX -- removed; std C requires it in limits.h
LONGLONG_MAX -- removed; never used
ULONGLONGMAX -- removed; never used

diff --git a/Include/Python.h b/Include/Python.h
index d4afdaf76bfef1b777d299d081d63e2720b6ddb2..32efa0ceb3392c0d38e72b730328a516cec426f4 100644 (file)
--- a/Include/Python.h
+++ b/Include/Python.h
@@ -33,6 +33,8 @@
 
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
+#else
+#error "limits.h is required by std C -- why isn't HAVE_LIMITS_H defined?"
 #endif
 
 #if defined(__sgi) && defined(WITH_THREAD) && !defined(_SGI_MP_SOURCE)

diff --git a/Include/longobject.h b/Include/longobject.h
index 6b1062576e6e2321868de055f55cdbba2f6aee56..4cc94026392520b3d780c0b2ebb0377a61c84010 100644 (file)
--- a/Include/longobject.h
+++ b/Include/longobject.h
@@ -33,18 +33,6 @@ extern DL_IMPORT(PyObject *) PyLong_FromVoidPtr(void *);
 extern DL_IMPORT(void *) PyLong_AsVoidPtr(PyObject *);
 
 #ifdef HAVE_LONG_LONG
-
-/* Hopefully this is portable... */
-#ifndef ULONG_MAX
-#define ULONG_MAX 4294967295U
-#endif
-#ifndef LONGLONG_MAX
-#define LONGLONG_MAX 9223372036854775807LL
-#endif
-#ifndef ULONGLONG_MAX
-#define ULONGLONG_MAX 0xffffffffffffffffULL
-#endif
-
 extern DL_IMPORT(PyObject *) PyLong_FromLongLong(LONG_LONG);
 extern DL_IMPORT(PyObject *) PyLong_FromUnsignedLongLong(unsigned LONG_LONG);
 extern DL_IMPORT(LONG_LONG) PyLong_AsLongLong(PyObject *);