SF patch 404928: Support for next Cygwin gcc (2.95.2-8)

diff --git a/Modules/_sre.c b/Modules/_sre.c
index 3d4054a8c7dac2ab849851f73d476d4c362d3afd..63e4ef361ec50335025df8a95acfa6a95c645011 100644 (file)
--- a/Modules/_sre.c
+++ b/Modules/_sre.c
@@ -2369,10 +2369,7 @@ static PyMethodDef _functions[] = {
     {NULL, NULL}
 };
 
-void
-#if defined(WIN32)
-__declspec(dllexport)
-#endif
+DL_EXPORT(void)
 init_sre(void)
 {
     PyObject* m;

diff --git a/Modules/gdbmmodule.c b/Modules/gdbmmodule.c
index 91bebbd8d453cb2bd4c75bfe88ccdcb7c783df86..5f83a28f14bb16d460ce70992326d61b8976d2db 100644 (file)
--- a/Modules/gdbmmodule.c
+++ b/Modules/gdbmmodule.c
@@ -11,7 +11,7 @@
 #include <fcntl.h>
 #include "gdbm.h"
 
-#ifdef WIN32
+#if defined(WIN32) && !defined(__CYGWIN__)
 #include "gdbmerrno.h"
 extern const char * gdbm_strerror(gdbm_error);
 #endif

diff --git a/Python/exceptions.c b/Python/exceptions.c
index c020defcb5283ba4bacea5b97cc5eb93618a8810..0c61c5df9597d933216a8b20a324ca203c5b031b 100644 (file)
--- a/Python/exceptions.c
+++ b/Python/exceptions.c
@@ -1042,10 +1042,7 @@ static struct {
 
 \f
 
-void
-#ifdef WIN32
-__declspec(dllexport)
-#endif /* WIN32 */
+DL_EXPORT(void)
 init_exceptions(void)
 {
     char *modulename = "exceptions";
@@ -1128,10 +1125,7 @@ init_exceptions(void)
 }
 
 
-void
-#ifdef WIN32
-__declspec(dllexport)
-#endif /* WIN32 */
+DL_EXPORT(void)
 fini_exceptions(void)
 {
     int i;