From e13ebcd0e89ca74cb69f95993d3816152a07025f Mon Sep 17 00:00:00 2001 From: Hartmut Kaiser Date: Sun, 4 Jul 2010 22:38:38 +0000 Subject: [PATCH] Spirit: merging from trunk upto rev. 61489 [SVN r63640] --- include/boost/python/detail/wrap_python.hpp | 4 ++-- test/exec.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/boost/python/detail/wrap_python.hpp b/include/boost/python/detail/wrap_python.hpp index 4868a987..eaef7841 100644 --- a/include/boost/python/detail/wrap_python.hpp +++ b/include/boost/python/detail/wrap_python.hpp @@ -182,8 +182,8 @@ typedef int pid_t; # define Py_REFCNT(o) (((PyObject*)(o))->ob_refcnt) # define Py_SIZE(o) (((PyVarObject*)(o))->ob_size) -# define PyVarObject_HEAD_INIT(type, size) \ - PyObject_HEAD_INIT(type) size, +# define PyVarObject_HEAD_INIT(type, size) \ + PyObject_HEAD_INIT(type) size, #endif diff --git a/test/exec.cpp b/test/exec.cpp index afd02d60..9fb005ea 100644 --- a/test/exec.cpp +++ b/test/exec.cpp @@ -61,11 +61,11 @@ void exec_test() // Register the module with the interpreter if (PyImport_AppendInittab(const_cast("embedded_hello"), #if PY_VERSION_HEX >= 0x03000000 - PyInit_embedded_hello + PyInit_embedded_hello #else - initembedded_hello + initembedded_hello #endif - ) == -1) + ) == -1) throw std::runtime_error("Failed to add embedded_hello to the interpreter's " "builtin modules"); // Retrieve the main module