summaryrefslogtreecommitdiff
path: root/py/modules/IcePy/Init.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2014-07-15 16:37:25 +0200
committerBenoit Foucher <benoit@zeroc.com>2014-07-15 16:37:25 +0200
commit84b7f50810d3c4f7087b1e4e39ec5072ac914ebc (patch)
treecbde7898bf4d722a1613be6a2aaee1542c53ebe8 /py/modules/IcePy/Init.cpp
parentICE-5485 add config.admin for IceStorm demos (diff)
downloadice-84b7f50810d3c4f7087b1e4e39ec5072ac914ebc.tar.bz2
ice-84b7f50810d3c4f7087b1e4e39ec5072ac914ebc.tar.xz
ice-84b7f50810d3c4f7087b1e4e39ec5072ac914ebc.zip
Fixed IcePy Windows build failure
Diffstat (limited to 'py/modules/IcePy/Init.cpp')
-rw-r--r--py/modules/IcePy/Init.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/py/modules/IcePy/Init.cpp b/py/modules/IcePy/Init.cpp
index dacb13a1cea..b34450764fa 100644
--- a/py/modules/IcePy/Init.cpp
+++ b/py/modules/IcePy/Init.cpp
@@ -115,15 +115,14 @@ PyDoc_STRVAR(moduleDoc, "The Internet Communications Engine.");
#endif
-#if defined(__SUNPRO_CC) && (__SUNPRO_CC >= 0x550)
-extern "C" __global void
-#else
PyMODINIT_FUNC
+#ifndef _WIN32 // On Windows, PyMODINIT_FUNC already defines dllexport
+ICE_DECLSPEC_EXPORT
#endif
#if PY_VERSION_HEX >= 0x03000000
-ICE_DECLSPEC_EXPORT PyInit_IcePy(void)
+PyInit_IcePy(void)
#else
-ICE_DECLSPEC_EXPORT initIcePy(void)
+initIcePy(void)
#endif
{
PyObject* module;