From c15812add2425ba0b2fc454f0f61303ddd0fb0c1 Mon Sep 17 00:00:00 2001 From: Dave Abrahams Date: Sat, 13 Jul 2002 12:11:53 +0000 Subject: [PATCH] long long fixes [SVN r14434] --- include/boost/python/detail/wrap_python.hpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/include/boost/python/detail/wrap_python.hpp b/include/boost/python/detail/wrap_python.hpp index 7bafb9fe..e2392bc5 100644 --- a/include/boost/python/detail/wrap_python.hpp +++ b/include/boost/python/detail/wrap_python.hpp @@ -20,7 +20,10 @@ // 04 Mar 01 Rolled in some changes from the Dragon fork (Dave Abrahams) // 01 Mar 01 define PyObject_INIT() for Python 1.x (Dave Abrahams) -// Python's LongObject.h helpfully #defines these for us, which confuses Boost's config +// +// Python's LongObject.h helpfully #defines ULONGLONG_MAX for us, +// which confuses Boost's config +// #include #ifndef ULONG_MAX # define BOOST_PYTHON_ULONG_MAX_UNDEFINED @@ -32,6 +35,9 @@ # define BOOST_PYTHON_ULONGLONG_MAX_UNDEFINED #endif +// +// Get ahold of Python's version number +// #include #ifdef _DEBUG @@ -105,10 +111,6 @@ typedef int pid_t; # endif # undef HAVE_HYPOT # define HAVE_HYPOT 1 -# elif defined(_MSC_VER) -# ifdef __cplusplus -# include // prevents Python.h from defining LONGLONG_MAX, LONGLONG_MIN, and ULONGLONG_MAX -# endif # endif #endif // _WIN32