Author: jghali
Date: Thu Feb 18 11:55:16 2021
New Revision: 24502
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24502
Log:
Fix a build error in scripter plugin caused by clash betweenh Qt slots macro
and slots variable defined in python headers
Modified:
trunk/Scribus/scribus/plugins/scriptplugin/cmdvar.h
Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdvar.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24502&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdvar.h
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdvar.h (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdvar.h Thu Feb 18 11:55:16 2021
@@ -18,7 +18,7 @@
#undef _POSIX_C_SOURCE
#endif
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) || defined(__GNUC__) || defined(__clang__)
#pragma push_macro("slots")
#undef slots
#endif
@@ -29,7 +29,7 @@
#include <Python.h>
#endif
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) || defined(__GNUC__) || defined(__clang__)
#pragma pop_macro("slots")
#endif
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
