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.

1 files changed, 13 insertions, 13 deletions

diff --git a/Include/pydebug.h b/Include/pydebug.h
index e24c9fe..9a5773a 100644
--- a/Include/pydebug.h
+++ b/Include/pydebug.h
@@ -5,28 +5,28 @@
 extern "C" {
 #endif
 
-extern DL_IMPORT(int) Py_DebugFlag;
-extern DL_IMPORT(int) Py_VerboseFlag;
-extern DL_IMPORT(int) Py_InteractiveFlag;
-extern DL_IMPORT(int) Py_OptimizeFlag;
-extern DL_IMPORT(int) Py_NoSiteFlag;
-extern DL_IMPORT(int) Py_UseClassExceptionsFlag;
-extern DL_IMPORT(int) Py_FrozenFlag;
-extern DL_IMPORT(int) Py_TabcheckFlag;
-extern DL_IMPORT(int) Py_UnicodeFlag;
-extern DL_IMPORT(int) Py_IgnoreEnvironmentFlag;
-extern DL_IMPORT(int) Py_DivisionWarningFlag;
+PyAPI_DATA(int) Py_DebugFlag;
+PyAPI_DATA(int) Py_VerboseFlag;
+PyAPI_DATA(int) Py_InteractiveFlag;
+PyAPI_DATA(int) Py_OptimizeFlag;
+PyAPI_DATA(int) Py_NoSiteFlag;
+PyAPI_DATA(int) Py_UseClassExceptionsFlag;
+PyAPI_DATA(int) Py_FrozenFlag;
+PyAPI_DATA(int) Py_TabcheckFlag;
+PyAPI_DATA(int) Py_UnicodeFlag;
+PyAPI_DATA(int) Py_IgnoreEnvironmentFlag;
+PyAPI_DATA(int) Py_DivisionWarningFlag;
 /* _XXX Py_QnewFlag should go away in 2.3.  It's true iff -Qnew is passed,
   on the command line, and is used in 2.2 by ceval.c to make all "/" divisions
   true divisions (which they will be in 2.3). */
-extern DL_IMPORT(int) _Py_QnewFlag;
+PyAPI_DATA(int) _Py_QnewFlag;
 
 /* this is a wrapper around getenv() that pays attention to
    Py_IgnoreEnvironmentFlag.  It should be used for getting variables like
    PYTHONPATH and PYTHONHOME from the environment */
 #define Py_GETENV(s) (Py_IgnoreEnvironmentFlag ? NULL : getenv(s))
 
-DL_IMPORT(void) Py_FatalError(const char *message);
+PyAPI_FUNC(void) Py_FatalError(const char *message);
 
 #ifdef __cplusplus
 }