Skip to content

Commit 7e51331

Browse files
committed
Move definition of PYBIND11_DETAIL_MODULE_STATIC_DEF and PYBIND11_DETAIL_MODULE_CREATE macros up
1 parent 4c41330 commit 7e51331

File tree

1 file changed

+14
-13
lines changed

1 file changed

+14
-13
lines changed

include/pybind11/detail/common.h

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,20 @@ extern "C" {
261261
return nullptr; \
262262
} \
263263

264+
#if PY_MAJOR_VERSION >= 3
265+
#define PYBIND11_DETAIL_MODULE_STATIC_DEF(name) \
266+
static PyModuleDef PYBIND11_CONCAT(pybind11_module_def_, name);
267+
#define PYBIND11_DETAIL_MODULE_CREATE(name) \
268+
auto m = ::pybind11::detail::create_top_level_module( \
269+
PYBIND11_TOSTRING(name), nullptr, \
270+
&PYBIND11_CONCAT(pybind11_module_def_, name));
271+
#else
272+
#define PYBIND11_DETAIL_MODULE_STATIC_DEF(name)
273+
#define PYBIND11_DETAIL_MODULE_CREATE(name) \
274+
auto m = ::pybind11::detail::create_top_level_module( \
275+
PYBIND11_TOSTRING(name), nullptr);
276+
#endif
277+
264278
/** \rst
265279
***Deprecated in favor of PYBIND11_MODULE***
266280
@@ -309,19 +323,6 @@ extern "C" {
309323
});
310324
}
311325
\endrst */
312-
#if PY_MAJOR_VERSION >= 3
313-
#define PYBIND11_DETAIL_MODULE_STATIC_DEF(name) \
314-
static PyModuleDef PYBIND11_CONCAT(pybind11_module_def_, name);
315-
#define PYBIND11_DETAIL_MODULE_CREATE(name) \
316-
auto m = ::pybind11::detail::create_top_level_module( \
317-
PYBIND11_TOSTRING(name), nullptr, \
318-
&PYBIND11_CONCAT(pybind11_module_def_, name));
319-
#else
320-
#define PYBIND11_DETAIL_MODULE_STATIC_DEF(name)
321-
#define PYBIND11_DETAIL_MODULE_CREATE(name) \
322-
auto m = ::pybind11::detail::create_top_level_module( \
323-
PYBIND11_TOSTRING(name), nullptr);
324-
#endif
325326
#define PYBIND11_MODULE(name, variable) \
326327
PYBIND11_DETAIL_MODULE_STATIC_DEF(name) \
327328
PYBIND11_MAYBE_UNUSED \

0 commit comments

Comments
 (0)