diff options
| author | Neal Norwitz <nnorwitz@gmail.com> | 2006-12-28 04:47:50 (GMT) |
|---|---|---|
| committer | Neal Norwitz <nnorwitz@gmail.com> | 2006-12-28 04:47:50 (GMT) |
| commit | f6657e67b3cf89649d14d9012b3964a3490d45b0 (patch) | |
| tree | f04317257f7b1ff54f5142eda58af84c6d261bc1 /Modules | |
| parent | 545686b279ef382ec35aa12afa1f9271ce6d5109 (diff) | |
| download | cpython-f6657e67b3cf89649d14d9012b3964a3490d45b0.zip cpython-f6657e67b3cf89649d14d9012b3964a3490d45b0.tar.gz cpython-f6657e67b3cf89649d14d9012b3964a3490d45b0.tar.bz2 | |
Cruft removal:
* DL_IMPORT/DL_EXPORT
* #if 0'd code
* Py_PROTO which was obsolete, but still used in one place in addrinfo.h
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/_bsddb.c | 4 | ||||
| -rw-r--r-- | Modules/_ctypes/_ctypes_test.c | 6 | ||||
| -rw-r--r-- | Modules/_elementtree.c | 2 | ||||
| -rw-r--r-- | Modules/addrinfo.h | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/Modules/_bsddb.c b/Modules/_bsddb.c index 79f06dc..68489e9 100644 --- a/Modules/_bsddb.c +++ b/Modules/_bsddb.c @@ -5627,7 +5627,7 @@ static PyMethodDef bsddb_methods[] = { #define MODULE_NAME_MAX_LEN 11 static char _bsddbModuleName[MODULE_NAME_MAX_LEN+1] = "_bsddb"; -DL_EXPORT(void) init_bsddb(void) +PyMODINIT_FUNC init_bsddb(void) { PyObject* m; PyObject* d; @@ -6032,7 +6032,7 @@ DL_EXPORT(void) init_bsddb(void) /* allow this module to be named _pybsddb so that it can be installed * and imported on top of python >= 2.3 that includes its own older * copy of the library named _bsddb without importing the old version. */ -DL_EXPORT(void) init_pybsddb(void) +PyMODINIT_FUNC init_pybsddb(void) { strncpy(_bsddbModuleName, "_pybsddb", MODULE_NAME_MAX_LEN); init_bsddb(); diff --git a/Modules/_ctypes/_ctypes_test.c b/Modules/_ctypes/_ctypes_test.c index d13fec4..9e7c212 100644 --- a/Modules/_ctypes/_ctypes_test.c +++ b/Modules/_ctypes/_ctypes_test.c @@ -330,7 +330,7 @@ struct BITS { short M: 1, N: 2, O: 3, P: 4, Q: 5, R: 6, S: 7; }; -DL_EXPORT(void) set_bitfields(struct BITS *bits, char name, int value) +PyAPI_FUNC(void) set_bitfields(struct BITS *bits, char name, int value) { switch (name) { case 'A': bits->A = value; break; @@ -353,7 +353,7 @@ DL_EXPORT(void) set_bitfields(struct BITS *bits, char name, int value) } } -DL_EXPORT(int) unpack_bitfields(struct BITS *bits, char name) +PyAPI_FUNC(int) unpack_bitfields(struct BITS *bits, char name) { switch (name) { case 'A': return bits->A; @@ -547,7 +547,7 @@ EXPORT (HRESULT) KeepObject(IUnknown *punk) #endif -DL_EXPORT(void) +PyMODINIT_FUNC init_ctypes_test(void) { Py_InitModule("_ctypes_test", module_methods); diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c index e5d61c6..2766b41 100644 --- a/Modules/_elementtree.c +++ b/Modules/_elementtree.c @@ -2612,7 +2612,7 @@ static PyMethodDef _functions[] = { {NULL, NULL} }; -DL_EXPORT(void) +PyMODINIT_FUNC init_elementtree(void) { PyObject* m; diff --git a/Modules/addrinfo.h b/Modules/addrinfo.h index 6f67a2e..fe7e96f 100644 --- a/Modules/addrinfo.h +++ b/Modules/addrinfo.h @@ -170,7 +170,7 @@ struct sockaddr_storage { #ifdef __cplusplus extern "C" { #endif -extern void freehostent Py_PROTO((struct hostent *)); +extern void freehostent(struct hostent *); #ifdef __cplusplus } #endif |