diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-10-06 10:34:27 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-10-06 13:04:15 +0200 |
| commit | 80f8731ee894d3cd40be9a2a0f3778f60dbc6afa (patch) | |
| tree | 6ae372d206781d908aa0a99dfd45e3f599c13e85 | |
| parent | d71a4489bcd404bfd3af3ed7938f4cc804e09626 (diff) | |
shiboken2: Simplify the export of the generated module init function
Replace the macro generated into the code by the one
introduced by 430d02db24b95a56ae0acc6a9df6a0effe49da0d.
Change-Id: I8e713ff25c180a22569a3ba589d04dca43fdc804
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
| -rw-r--r-- | sources/shiboken2/generator/shiboken2/cppgenerator.cpp | 8 | ||||
| -rw-r--r-- | sources/shiboken2/libshiboken/sbkmodule.h | 4 |
2 files changed, 2 insertions, 10 deletions
diff --git a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp index 69b070e7d..773001758 100644 --- a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp +++ b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp @@ -5973,14 +5973,6 @@ bool CppGenerator::finishGeneration() s << Qt::endl; } - s << "#if defined _WIN32 || defined __CYGWIN__\n"; - s << " #define SBK_EXPORT_MODULE __declspec(dllexport)\n"; - s << "#elif __GNUC__ >= 4\n"; - s << " #define SBK_EXPORT_MODULE __attribute__ ((visibility(\"default\")))\n"; - s << "#else\n"; - s << " #define SBK_EXPORT_MODULE\n"; - s << "#endif\n\n"; - s << "#ifdef IS_PY3K\n"; s << "static struct PyModuleDef moduledef = {\n"; s << " /* m_base */ PyModuleDef_HEAD_INIT,\n"; diff --git a/sources/shiboken2/libshiboken/sbkmodule.h b/sources/shiboken2/libshiboken/sbkmodule.h index 75eff5a79..caaf3de5f 100644 --- a/sources/shiboken2/libshiboken/sbkmodule.h +++ b/sources/shiboken2/libshiboken/sbkmodule.h @@ -46,14 +46,14 @@ #if PY_MAJOR_VERSION >= 3 #define SBK_MODULE_INIT_ERROR 0 #define SBK_MODULE_INIT_FUNCTION_BEGIN(ModuleName) \ - extern "C" SBK_EXPORT_MODULE PyObject *PyInit_##ModuleName() { + extern "C" LIBSHIBOKEN_EXPORT PyObject *PyInit_##ModuleName() { #define SBK_MODULE_INIT_FUNCTION_END \ return module; } #else #define SBK_MODULE_INIT_ERROR #define SBK_MODULE_INIT_FUNCTION_BEGIN(ModuleName) \ - extern "C" SBK_EXPORT_MODULE void init##ModuleName() { + extern "C" LIBSHIBOKEN_EXPORT void init##ModuleName() { #define SBK_MODULE_INIT_FUNCTION_END \ } |