diff options
| -rw-r--r-- | Modules/mmapmodule.c | 8 | ||||
| -rw-r--r-- | Modules/readline.c | 8 | ||||
| -rw-r--r-- | Modules/rotormodule.c | 3 | ||||
| -rw-r--r-- | Modules/shamodule.c | 2 |
4 files changed, 10 insertions, 11 deletions
diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c index 332b2da..c567e7b 100644 --- a/Modules/mmapmodule.c +++ b/Modules/mmapmodule.c @@ -952,13 +952,7 @@ static struct PyMethodDef mmap_functions[] = { {NULL, NULL} /* Sentinel */ }; -#ifdef MS_WIN32 -__declspec(dllexport) void -#endif /* MS_WIN32 */ -#ifdef UNIX -extern void -#endif - +DL_EXPORT(void) initmmap(void) { PyObject *dict, *module; diff --git a/Modules/readline.c b/Modules/readline.c index cf0b064..8bb0239 100644 --- a/Modules/readline.c +++ b/Modules/readline.c @@ -27,6 +27,9 @@ #else #include <readline/readline.h> /* You may need to add an -I option to Setup */ +#ifdef __CYGWIN__ +#include <readline/history.h> +#else /* !__CYGWIN__ */ extern int rl_parse_and_bind(char *); extern int rl_read_init_file(char *); extern int rl_insert_text(char *); @@ -38,11 +41,12 @@ extern int read_history(char *); extern int write_history(char *); extern int history_truncate_file(char *, int); extern Function *rl_event_hook; +#endif /* !__CYGWIN__ */ #endif /* Pointers needed from outside (but not declared in a header file). */ -extern int (*PyOS_InputHook)(void); -extern char *(*PyOS_ReadlineFunctionPointer)(char *); +extern DL_IMPORT(int) (*PyOS_InputHook)(void); +extern DL_IMPORT(char) *(*PyOS_ReadlineFunctionPointer)(char *); /* Exported function to send one line to readline's init file parser */ diff --git a/Modules/rotormodule.c b/Modules/rotormodule.c index 9f58ff2..cc25924 100644 --- a/Modules/rotormodule.c +++ b/Modules/rotormodule.c @@ -576,7 +576,7 @@ rotorobj_getattr(Rotorobj *s, char *name) statichere PyTypeObject Rotor_Type = { - PyObject_HEAD_INIT(&PyType_Type) + PyObject_HEAD_INIT(NULL) 0, /*ob_size*/ "rotor", /*tp_name*/ sizeof(Rotorobj), /*tp_size*/ @@ -619,5 +619,6 @@ rotor_methods[] = { DL_EXPORT(void) initrotor(void) { + Rotor_Type.ob_type = &PyType_Type; (void)Py_InitModule("rotor", rotor_methods); } diff --git a/Modules/shamodule.c b/Modules/shamodule.c index 8f95230..32ac02d 100644 --- a/Modules/shamodule.c +++ b/Modules/shamodule.c @@ -529,7 +529,7 @@ static struct PyMethodDef SHA_functions[] = { if (o!=NULL) PyDict_SetItemString(d,n,o); \ Py_XDECREF(o); } -void +DL_EXPORT(void) initsha(void) { PyObject *d, *m; |