diff options
| -rw-r--r-- | Include/Python.h | 5 | ||||
| -rw-r--r-- | Include/pyport.h | 10 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | configure.in | 10 | ||||
| -rw-r--r-- | pyconfig.h.in | 10 |
5 files changed, 13 insertions, 24 deletions
diff --git a/Include/Python.h b/Include/Python.h index e3addc7..593c8f6 100644 --- a/Include/Python.h +++ b/Include/Python.h @@ -22,12 +22,13 @@ #include "patchlevel.h" #include "pyconfig.h" +#include "pyport.h" #ifdef HAVE_LIMITS_H #include <limits.h> #endif -/* pyconfig.h may or may not define DL_IMPORT */ +/* pyconfig.h or pyport.h may or may not define DL_IMPORT */ #ifndef DL_IMPORT /* declarations for DLL import/export */ #define DL_IMPORT(RTYPE) RTYPE #endif @@ -59,8 +60,6 @@ */ #include <assert.h> -#include "pyport.h" - /* Debug-mode build with pymalloc implies PYMALLOC_DEBUG. * PYMALLOC_DEBUG is in error if pymalloc is not in use. */ diff --git a/Include/pyport.h b/Include/pyport.h index 790c7af..5c3e0a9 100644 --- a/Include/pyport.h +++ b/Include/pyport.h @@ -384,9 +384,19 @@ extern int fsync(int fd); extern double hypot(double, double); #endif +#ifndef __CYGWIN__ #ifndef DL_IMPORT /* declarations for DLL import */ #define DL_IMPORT(RTYPE) RTYPE #endif +#else /* __CYGWIN__ */ +#ifdef USE_DL_IMPORT +#define DL_IMPORT(RTYPE) __declspec(dllimport) RTYPE +#define DL_EXPORT(RTYPE) __declspec(dllexport) RTYPE +#else /* !USE_DL_IMPORT */ +#define DL_IMPORT(RTYPE) __declspec(dllexport) RTYPE +#define DL_EXPORT(RTYPE) __declspec(dllexport) RTYPE +#endif /* USE_DL_IMPORT */ +#endif /* __CYGWIN__ */ /* If the fd manipulation macros aren't defined, here is a set that should do the job */ @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.314 . +# From configure.in Revision: 1.315 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.53. # diff --git a/configure.in b/configure.in index dcae3d8..c90f60c 100644 --- a/configure.in +++ b/configure.in @@ -7,16 +7,6 @@ AC_CONFIG_HEADER(pyconfig.h) # This is for stuff that absolutely must end up in pyconfig.h. # Please use pyport.h instead, if possible. AH_BOTTOM([ -#ifdef __CYGWIN__ -#ifdef USE_DL_IMPORT -#define DL_IMPORT(RTYPE) __declspec(dllimport) RTYPE -#define DL_EXPORT(RTYPE) __declspec(dllexport) RTYPE -#else -#define DL_IMPORT(RTYPE) __declspec(dllexport) RTYPE -#define DL_EXPORT(RTYPE) __declspec(dllexport) RTYPE -#endif -#endif - /* Define the macros needed if on a UnixWare 7.x system. */ #if defined(__USLC__) && defined(__SCO_VERSION__) #define STRICT_SYSV_CURSES /* Don't use ncurses extensions */ diff --git a/pyconfig.h.in b/pyconfig.h.in index 8e96db2..86bd6c8 100644 --- a/pyconfig.h.in +++ b/pyconfig.h.in @@ -825,16 +825,6 @@ #undef volatile -#ifdef __CYGWIN__ -#ifdef USE_DL_IMPORT -#define DL_IMPORT(RTYPE) __declspec(dllimport) RTYPE -#define DL_EXPORT(RTYPE) __declspec(dllexport) RTYPE -#else -#define DL_IMPORT(RTYPE) __declspec(dllexport) RTYPE -#define DL_EXPORT(RTYPE) __declspec(dllexport) RTYPE -#endif -#endif - /* Define the macros needed if on a UnixWare 7.x system. */ #if defined(__USLC__) && defined(__SCO_VERSION__) #define STRICT_SYSV_CURSES /* Don't use ncurses extensions */ |