Changeset 10 for python/trunk/Include/pyport.h

Timestamp:

Sep 3, 2010, 5:33:06 PM (15 years ago)

Author:

Yuri Dario

Message:

python: merged offline changes.

File:

• python/trunk/Include/pyport.h (modified) (3 diffs)

python/trunk/Include/pyport.h

@@ -550 +550 @@
 
   BeOS and cygwin are the only other autoconf platform requiring special
-  linkage handling and both of these use __declspec().
+  linkage handling and both of these use __declspec(). Ditto for OS/2.
 */
-#if defined(__CYGWIN__) || defined(__BEOS__)
+#if defined(__CYGWIN__) || defined(__BEOS__) || defined(__OS2__)
 #       define HAVE_DECLSPEC_DLL
 #endif
@@ -564 +564 @@
                         /* module init functions inside the core need no external linkage */
                         /* except for Cygwin to handle embedding (FIXME: BeOS too?) */
-#                       if defined(__CYGWIN__)
+#                       if defined(__CYGWIN__) || defined(__OS2__)
 #                               define PyMODINIT_FUNC __declspec(dllexport) void
 #                       else /* __CYGWIN__ */
@@ -574 +574 @@
                         /* Under Cygwin, auto-import functions to prevent compilation */
                         /* failures similar to http://python.org/doc/FAQ.html#3.24 */
-#                       if !defined(__CYGWIN__)
+#                       if !defined(__CYGWIN__) && !defined(__OS2__)
 #                               define PyAPI_FUNC(RTYPE) __declspec(dllimport) RTYPE
 #                       endif /* !__CYGWIN__ */
+#                       if !defined(__OS2__)
 #                       define PyAPI_DATA(RTYPE) extern __declspec(dllimport) RTYPE
+#                       endif /* !__OS2__ */
                         /* module init functions outside the core must be exported */
 #                       if defined(__cplusplus)