From f6657e67b3cf89649d14d9012b3964a3490d45b0 Mon Sep 17 00:00:00 2001 From: Neal Norwitz Date: Thu, 28 Dec 2006 04:47:50 +0000 Subject: [PATCH] Cruft removal: * DL_IMPORT/DL_EXPORT * #if 0'd code * Py_PROTO which was obsolete, but still used in one place in addrinfo.h --- Include/Python.h | 8 ---- Include/pyport.h | 84 +--------------------------------- Modules/_bsddb.c | 4 +- Modules/_ctypes/_ctypes_test.c | 6 +-- Modules/_elementtree.c | 2 +- Modules/addrinfo.h | 2 +- 6 files changed, 8 insertions(+), 98 deletions(-) diff --git a/Include/Python.h b/Include/Python.h index d75854cae8d..397ceb99ff2 100644 --- a/Include/Python.h +++ b/Include/Python.h @@ -48,14 +48,6 @@ #include "pyport.h" -/* pyconfig.h or pyport.h may or may not define DL_IMPORT */ -#ifndef DL_IMPORT /* declarations for DLL import/export */ -#define DL_IMPORT(RTYPE) RTYPE -#endif -#ifndef DL_EXPORT /* declarations for DLL import/export */ -#define DL_EXPORT(RTYPE) RTYPE -#endif - /* Debug-mode build with pymalloc implies PYMALLOC_DEBUG. * PYMALLOC_DEBUG is in error if pymalloc is not in use. */ diff --git a/Include/pyport.h b/Include/pyport.h index 36d517cd99d..fb57aceb370 100644 --- a/Include/pyport.h +++ b/Include/pyport.h @@ -35,17 +35,6 @@ Used in: PY_LONG_LONG **************************************************************************/ - -/* For backward compatibility only. Obsolete, do not use. */ -#ifdef HAVE_PROTOTYPES -#define Py_PROTO(x) x -#else -#define Py_PROTO(x) () -#endif -#ifndef Py_FPROTO -#define Py_FPROTO(x) Py_PROTO(x) -#endif - /* typedefs for some C9X-defined synonyms for integral types. * * The names in Python are exactly the same as the C9X names, except with a @@ -226,9 +215,7 @@ typedef Py_intptr_t Py_ssize_t; /* NB caller must include */ #ifdef HAVE_SYS_SELECT_H - #include - #endif /* !HAVE_SYS_SELECT_H */ /******************************* @@ -504,7 +491,7 @@ extern int gethostname(char *, int); #ifdef __BEOS__ /* Unchecked */ /* It's in the libs, but not the headers... - [cjh] */ -int shutdown( int, int ); +int shutdown(int, int); #endif #ifdef HAVE__GETPTY @@ -523,25 +510,6 @@ extern int forkpty(int *, char *, struct termios *, struct winsize *); #endif /* defined(HAVE_OPENPTY) || defined(HAVE_FORKPTY) */ -/* These are pulled from various places. It isn't obvious on what platforms - they are necessary, nor what the exact prototype should look like (which - is likely to vary between platforms!) If you find you need one of these - declarations, please move them to a platform-specific block and include - proper prototypes. */ -#if 0 - -/* From Modules/resource.c */ -extern int getrusage(); -extern int getpagesize(); - -/* From Python/sysmodule.c and Modules/posixmodule.c */ -extern int fclose(FILE *); - -/* From Modules/posixmodule.c */ -extern int fdatasync(int); -#endif /* 0 */ - - /************************ * WRAPPER FOR * ************************/ @@ -651,56 +619,6 @@ extern double hypot(double, double); # endif /* __cplusplus */ #endif -/* Deprecated DL_IMPORT and DL_EXPORT macros */ -#if defined(Py_ENABLE_SHARED) && defined (HAVE_DECLSPEC_DLL) -# if defined(Py_BUILD_CORE) -# define DL_IMPORT(RTYPE) __declspec(dllexport) RTYPE -# define DL_EXPORT(RTYPE) __declspec(dllexport) RTYPE -# else -# define DL_IMPORT(RTYPE) __declspec(dllimport) RTYPE -# define DL_EXPORT(RTYPE) __declspec(dllexport) RTYPE -# endif -#endif -#ifndef DL_EXPORT -# define DL_EXPORT(RTYPE) RTYPE -#endif -#ifndef DL_IMPORT -# define DL_IMPORT(RTYPE) RTYPE -#endif -/* End of deprecated DL_* macros */ - -/* If the fd manipulation macros aren't defined, - here is a set that should do the job */ - -#if 0 /* disabled and probably obsolete */ - -#ifndef FD_SETSIZE -#define FD_SETSIZE 256 -#endif - -#ifndef FD_SET - -typedef long fd_mask; - -#define NFDBITS (sizeof(fd_mask) * NBBY) /* bits per mask */ -#ifndef howmany -#define howmany(x, y) (((x)+((y)-1))/(y)) -#endif /* howmany */ - -typedef struct fd_set { - fd_mask fds_bits[howmany(FD_SETSIZE, NFDBITS)]; -} fd_set; - -#define FD_SET(n, p) ((p)->fds_bits[(n)/NFDBITS] |= (1 << ((n) % NFDBITS))) -#define FD_CLR(n, p) ((p)->fds_bits[(n)/NFDBITS] &= ~(1 << ((n) % NFDBITS))) -#define FD_ISSET(n, p) ((p)->fds_bits[(n)/NFDBITS] & (1 << ((n) % NFDBITS))) -#define FD_ZERO(p) memset((char *)(p), '\0', sizeof(*(p))) - -#endif /* FD_SET */ - -#endif /* fd manipulation macros */ - - /* limits.h constants that may be missing */ #ifndef INT_MAX diff --git a/Modules/_bsddb.c b/Modules/_bsddb.c index 79f06dcf0ab..68489e9a48e 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 d13fec4e9ea..9e7c212bc41 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 e5d61c67ff4..2766b41758e 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 6f67a2e957e..fe7e96f1baf 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