diff options
| author | Mark Hammond <mhammond@skippinet.com.au> | 2002-07-29 13:42:14 (GMT) |
|---|---|---|
| committer | Mark Hammond <mhammond@skippinet.com.au> | 2002-07-29 13:42:14 (GMT) |
| commit | a2905273766bbbebb87274c87b62772cdfaeb180 (patch) | |
| tree | 0d6895a5967201c6908e1838cc2e39de6fdf13de /Include/pyport.h | |
| parent | f4ad4ce5a0f644417c6c50035979020386fe09fc (diff) | |
| download | cpython-a2905273766bbbebb87274c87b62772cdfaeb180.zip cpython-a2905273766bbbebb87274c87b62772cdfaeb180.tar.gz cpython-a2905273766bbbebb87274c87b62772cdfaeb180.tar.bz2 | |
Excise DL_IMPORT/EXPORT from object.h, and related files. This patch
also adds 'extern' to PyAPI_DATA rather than at each declaration, as
discussed with Tim and Guido.
Diffstat (limited to 'Include/pyport.h')
| -rw-r--r-- | Include/pyport.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Include/pyport.h b/Include/pyport.h index c362ca0..f1c42fb 100644 --- a/Include/pyport.h +++ b/Include/pyport.h @@ -405,14 +405,14 @@ and both these use __declspec() # if defined(HAVE_DECLSPEC_DLL) # ifdef Py_BUILD_CORE # define PyAPI_FUNC(RTYPE) __declspec(dllexport) RTYPE -# define PyAPI_DATA(RTYPE) __declspec(dllexport) RTYPE +# define PyAPI_DATA(RTYPE) extern __declspec(dllexport) RTYPE /* module init functions inside the core need no external linkage */ # define PyMODINIT_FUNC void # else /* Py_BUILD_CORE */ /* Building an extension module, or an embedded situation */ /* public Python functions and data are imported */ # define PyAPI_FUNC(RTYPE) __declspec(dllimport) RTYPE -# define PyAPI_DATA(RTYPE) __declspec(dllimport) RTYPE +# define PyAPI_DATA(RTYPE) extern __declspec(dllimport) RTYPE /* module init functions outside the core must be exported */ # if defined(__cplusplus) # define PyMODINIT_FUNC extern "C" __declspec(dllexport) void @@ -428,7 +428,7 @@ and both these use __declspec() # define PyAPI_FUNC(RTYPE) RTYPE #endif #ifndef PyAPI_DATA -# define PyAPI_DATA(RTYPE) RTYPE +# define PyAPI_DATA(RTYPE) extern RTYPE #endif #ifndef PyMODINIT_FUNC # if defined(__cplusplus) |