Skip to content

Commit c15812a

Browse files
committed
long long fixes
[SVN r14434]
1 parent 3375cdb commit c15812a

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

include/boost/python/detail/wrap_python.hpp

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@
2020
// 04 Mar 01 Rolled in some changes from the Dragon fork (Dave Abrahams)
2121
// 01 Mar 01 define PyObject_INIT() for Python 1.x (Dave Abrahams)
2222

23-
// Python's LongObject.h helpfully #defines these for us, which confuses Boost's config
23+
//
24+
// Python's LongObject.h helpfully #defines ULONGLONG_MAX for us,
25+
// which confuses Boost's config
26+
//
2427
#include <limits.h>
2528
#ifndef ULONG_MAX
2629
# define BOOST_PYTHON_ULONG_MAX_UNDEFINED
@@ -32,6 +35,9 @@
3235
# define BOOST_PYTHON_ULONGLONG_MAX_UNDEFINED
3336
#endif
3437

38+
//
39+
// Get ahold of Python's version number
40+
//
3541
#include <patchlevel.h>
3642

3743
#ifdef _DEBUG
@@ -105,10 +111,6 @@ typedef int pid_t;
105111
# endif
106112
# undef HAVE_HYPOT
107113
# define HAVE_HYPOT 1
108-
# elif defined(_MSC_VER)
109-
# ifdef __cplusplus
110-
# include <limits> // prevents Python.h from defining LONGLONG_MAX, LONGLONG_MIN, and ULONGLONG_MAX
111-
# endif
112114
# endif
113115

114116
#endif // _WIN32

0 commit comments

Comments
 (0)