Ticket #4239: python.diff

vendor/boost/boost/python/detail/wrap_python.hpp

@@ -70 +70 @@
 #endif
 
 //
+// Latest versions of OSX ship Python as a framework
+//
+#if defined(__APPLE__)
+#  define BOOST_OSX_INCLUDE_PYTHON_AS_FRAMEWORK
+#endif
+//
+
+//
 // Get ahold of Python's version number
 //
+#if defined(BOOST_OSX_INCLUDE_PYTHON_AS_FRAMEWORK)
+# include <Python/patchlevel.h>
+#else
 #include <patchlevel.h>
+#endif
 
 #if PY_MAJOR_VERSION<2 || PY_MAJOR_VERSION==2 && PY_MINOR_VERSION<2
 #error Python 2.2 or higher is required for this version of Boost.Python.
@@ -138 +150 @@
 
 #if PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION == 2 && PY_MICRO_VERSION < 2
 # include <boost/python/detail/python22_fixed.h>
+#elif defined(BOOST_OSX_INCLUDE_PYTHON_AS_FRAMEWORK)
+# include <Python/Python.h>
 #else
 # include <Python.h>
 #endif

vendor/boost/libs/python/src/converter/from_python.cpp

@@ -40 +40 @@
     , registration const& converters)
 {
     rvalue_from_python_stage1_data data;
+    data.construct = 0;
 
     // First check to see if it's embedded in an extension class
     // instance, as a special case.

vendor/boost/libs/python/src/object/class.cpp

@@ -5 +5 @@
 
 #include <boost/python/detail/prefix.hpp>
 #include <boost/mpl/lambda.hpp> // #including this first is an intel6 workaround
+#include <boost/python/detail/wrap_python.hpp>
 
 #include <boost/python/object/class.hpp>
 #include <boost/python/object/instance.hpp>
@@ -25 +26 @@
 #include <vector>
 #include <cstddef>
 #include <new>
+
+#ifdef BOOST_OSX_INCLUDE_PYTHON_AS_FRAMEWORK
+#  include <Python/structmember.h>
+#else
 #include <structmember.h>
+#endif
 
 namespace boost { namespace python {
 

vendor/boost/libs/python/src/object/enum.cpp

@@ -3 +3 @@
 // accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
+#include <boost/python/detail/wrap_python.hpp>
 #include <boost/python/object/enum_base.hpp>
 #include <boost/python/cast.hpp>
 #include <boost/python/scope.hpp>
@@ -12 +13 @@
 #include <boost/python/str.hpp>
 #include <boost/python/extract.hpp>
 #include <boost/python/object_protocol.hpp>
+
+#if defined(BOOST_OSX_INCLUDE_PYTHON_AS_FRAMEWORK)
+#  include <Python/structmember.h>
+#else
 #include <structmember.h>
+#endif
 
 namespace boost { namespace python { namespace objects {