Land Patch [ 566100 ] Rationalize DL_IMPORT and DL_EXPORT.

1 files changed, 17 insertions, 17 deletions

diff --git a/Include/import.h b/Include/import.h
index f90dd2081b..3f6157d3f8 100644
--- a/Include/import.h
+++ b/Include/import.h
@@ -7,32 +7,32 @@
 extern "C" {
 #endif
 
-DL_IMPORT(long) PyImport_GetMagicNumber(void);
-DL_IMPORT(PyObject *) PyImport_ExecCodeModule(char *name, PyObject *co);
-DL_IMPORT(PyObject *) PyImport_ExecCodeModuleEx(
+PyAPI_FUNC(long) PyImport_GetMagicNumber(void);
+PyAPI_FUNC(PyObject *) PyImport_ExecCodeModule(char *name, PyObject *co);
+PyAPI_FUNC(PyObject *) PyImport_ExecCodeModuleEx(
 	char *name, PyObject *co, char *pathname);
-DL_IMPORT(PyObject *) PyImport_GetModuleDict(void);
-DL_IMPORT(PyObject *) PyImport_AddModule(char *name);
-DL_IMPORT(PyObject *) PyImport_ImportModule(char *name);
-DL_IMPORT(PyObject *) PyImport_ImportModuleEx(
+PyAPI_FUNC(PyObject *) PyImport_GetModuleDict(void);
+PyAPI_FUNC(PyObject *) PyImport_AddModule(char *name);
+PyAPI_FUNC(PyObject *) PyImport_ImportModule(char *name);
+PyAPI_FUNC(PyObject *) PyImport_ImportModuleEx(
 	char *name, PyObject *globals, PyObject *locals, PyObject *fromlist);
-DL_IMPORT(PyObject *) PyImport_Import(PyObject *name);
-DL_IMPORT(PyObject *) PyImport_ReloadModule(PyObject *m);
-DL_IMPORT(void) PyImport_Cleanup(void);
-DL_IMPORT(int) PyImport_ImportFrozenModule(char *);
+PyAPI_FUNC(PyObject *) PyImport_Import(PyObject *name);
+PyAPI_FUNC(PyObject *) PyImport_ReloadModule(PyObject *m);
+PyAPI_FUNC(void) PyImport_Cleanup(void);
+PyAPI_FUNC(int) PyImport_ImportFrozenModule(char *);
 
-extern DL_IMPORT(PyObject *)_PyImport_FindExtension(char *, char *);
-extern DL_IMPORT(PyObject *)_PyImport_FixupExtension(char *, char *);
+extern PyAPI_FUNC(PyObject *)_PyImport_FindExtension(char *, char *);
+extern PyAPI_FUNC(PyObject *)_PyImport_FixupExtension(char *, char *);
 
 struct _inittab {
     char *name;
     void (*initfunc)(void);
 };
 
-extern DL_IMPORT(struct _inittab *) PyImport_Inittab;
+extern PyAPI_DATA(struct _inittab *) PyImport_Inittab;
 
-extern DL_IMPORT(int) PyImport_AppendInittab(char *name, void (*initfunc)(void));
-extern DL_IMPORT(int) PyImport_ExtendInittab(struct _inittab *newtab);
+extern PyAPI_FUNC(int) PyImport_AppendInittab(char *name, void (*initfunc)(void));
+extern PyAPI_FUNC(int) PyImport_ExtendInittab(struct _inittab *newtab);
 
 struct _frozen {
     char *name;
@@ -43,7 +43,7 @@ struct _frozen {
 /* Embedding apps may change this pointer to point to their favorite
    collection of frozen modules: */
 
-extern DL_IMPORT(struct _frozen *) PyImport_FrozenModules;
+extern PyAPI_DATA(struct _frozen *) PyImport_FrozenModules;
 
 #ifdef __cplusplus
 }