diff options
| author | Neal Norwitz <nnorwitz@gmail.com> | 2003-07-01 20:15:21 +0000 |
|---|---|---|
| committer | Neal Norwitz <nnorwitz@gmail.com> | 2003-07-01 20:15:21 +0000 |
| commit | 21d896cfa1646a1da4e0ead57db9defc2ade397c (patch) | |
| tree | bf71a5632709fe09a2990ff128b3118444482584 | |
| parent | 59aba128a5266a944d9773f7223f25b164372146 (diff) | |
| download | cpython-git-21d896cfa1646a1da4e0ead57db9defc2ade397c.tar.gz | |
Use appropriate macros not the deprecated DL_IMPORT/DL_EXPORT macros
| -rw-r--r-- | Include/pyerrors.h | 2 | ||||
| -rw-r--r-- | Include/stringobject.h | 2 | ||||
| -rw-r--r-- | Modules/bz2module.c | 2 | ||||
| -rw-r--r-- | Modules/readline.c | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/Include/pyerrors.h b/Include/pyerrors.h index a4ab62ab7c..1715e9758c 100644 --- 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 7f67a1f1c0..3deea8f5d8 100644 --- 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 83582bd937..408c736ab6 100644 --- 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 bc8562ea65..a07b04a9cf 100644 --- 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 */ |