Use appropriate macros not the deprecated DL_IMPORT/DL_EXPORT macros

diff --git a/Include/pyerrors.h b/Include/pyerrors.h
index a4ab62ab7c7576a663327d8515a69246a1b32d65..1715e9758c3f333d2bc378fd1c27d5a980aeb1c5 100644 (file)
--- a/Include/pyerrors.h
+++ b/Include/pyerrors.h
@@ -63,7 +63,7 @@ PyAPI_DATA(PyObject *) PyExc_ZeroDivisionError;
 PyAPI_DATA(PyObject *) PyExc_WindowsError;
 #endif
 #ifdef __VMS
-extern DL_IMPORT(PyObject *) PyExc_VMSError;
+PyAPI_DATA(PyObject *) PyExc_VMSError;
 #endif
 
 PyAPI_DATA(PyObject *) PyExc_MemoryErrorInst;

diff --git a/Include/stringobject.h b/Include/stringobject.h
index 7f67a1f1c0c430e3c7b2f64639ffb051682b8949..3deea8f5d82b3572f55dd537448ae4e7e4ee131b 100644 (file)
--- a/Include/stringobject.h
+++ b/Include/stringobject.h
@@ -65,7 +65,7 @@ PyAPI_FUNC(int) _PyString_Eq(PyObject *, PyObject*);
 PyAPI_FUNC(PyObject *) PyString_Format(PyObject *, PyObject *);
 PyAPI_FUNC(PyObject *) _PyString_FormatLong(PyObject*, int, int,
                                                  int, char**, int*);
-extern DL_IMPORT(PyObject *) PyString_DecodeEscape(const char *, int, 
+PyAPI_FUNC(PyObject *) PyString_DecodeEscape(const char *, int, 
                                                   const char *, int,
                                                   const char *);
 

diff --git a/Modules/bz2module.c b/Modules/bz2module.c
index 83582bd937452daaff8d2afff0121f62d14d0feb..408c736ab6de3a85f83a7ad4927af004b0aaa036 100644 (file)
--- a/Modules/bz2module.c
+++ b/Modules/bz2module.c
@@ -2167,7 +2167,7 @@ interface, one shot (de)compression functions, and types for\n\
 sequential (de)compression.\n\
 ");
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 initbz2(void)
 {
        PyObject *m;

diff --git a/Modules/readline.c b/Modules/readline.c
index bc8562ea651d2843b00d9fd6d44fa3161f69d2cf..a07b04a9cf8112f6031985f23b0fd08c5bb6b907 100644 (file)
--- a/Modules/readline.c
+++ b/Modules/readline.c
@@ -32,8 +32,8 @@
 #endif
 
 /* Pointers needed from outside (but not declared in a header file). */
-extern DL_IMPORT(int) (*PyOS_InputHook)(void);
-extern DL_IMPORT(char) *(*PyOS_ReadlineFunctionPointer)(FILE *, FILE *,char *);
+PyAPI_FUNC(int) (*PyOS_InputHook)(void);
+PyAPI_FUNC(char) *(*PyOS_ReadlineFunctionPointer)(FILE *, FILE *,char *);
 
 
 /* Exported function to send one line to readline's init file parser */