diff options
| author | Christian Heimes <christian@cheimes.de> | 2007-11-28 10:05:53 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2007-11-28 10:05:53 (GMT) |
| commit | 218a5ed7d032c3e03a3e99b31612a667388c2653 (patch) | |
| tree | 45bea2686e4031dd64499917ef397484f4921e08 | |
| parent | 69a79638adc180e9c29f2171448326262e249761 (diff) | |
| download | cpython-218a5ed7d032c3e03a3e99b31612a667388c2653.zip cpython-218a5ed7d032c3e03a3e99b31612a667388c2653.tar.gz cpython-218a5ed7d032c3e03a3e99b31612a667388c2653.tar.bz2 | |
Fixed #1508 Removal of stale code in _csv.c / pyexpat.c
Credits belong to Joseph Armbruster
| -rw-r--r-- | Modules/_csv.c | 44 | ||||
| -rw-r--r-- | Modules/pyexpat.c | 14 |
2 files changed, 0 insertions, 58 deletions
diff --git a/Modules/_csv.c b/Modules/_csv.c index 596d5c2..7936597 100644 --- a/Modules/_csv.c +++ b/Modules/_csv.c @@ -17,50 +17,6 @@ module instead. #include "Python.h" #include "structmember.h" - -/* begin 2.2 compatibility macros */ -#ifndef PyDoc_STRVAR -/* Define macros for inline documentation. */ -#define PyDoc_VAR(name) static char name[] -#define PyDoc_STRVAR(name,str) PyDoc_VAR(name) = PyDoc_STR(str) -#ifdef WITH_DOC_STRINGS -#define PyDoc_STR(str) str -#else -#define PyDoc_STR(str) "" -#endif -#endif /* ifndef PyDoc_STRVAR */ - -#ifndef PyMODINIT_FUNC -# if defined(__cplusplus) -# define PyMODINIT_FUNC extern "C" void -# else /* __cplusplus */ -# define PyMODINIT_FUNC void -# endif /* __cplusplus */ -#endif - -#ifndef Py_CLEAR -#define Py_CLEAR(op) \ - do { \ - if (op) { \ - PyObject *tmp = (PyObject *)(op); \ - (op) = NULL; \ - Py_DECREF(tmp); \ - } \ - } while (0) -#endif -#ifndef Py_VISIT -#define Py_VISIT(op) \ - do { \ - if (op) { \ - int vret = visit((PyObject *)(op), arg); \ - if (vret) \ - return vret; \ - } \ - } while (0) -#endif - -/* end 2.2 compatibility macros */ - #define IS_BASESTRING(o) \ PyUnicode_Check(o) diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c index b18e371..738bfd2 100644 --- a/Modules/pyexpat.c +++ b/Modules/pyexpat.c @@ -8,20 +8,6 @@ #define XML_COMBINED_VERSION (10000*XML_MAJOR_VERSION+100*XML_MINOR_VERSION+XML_MICRO_VERSION) -#ifndef PyDoc_STRVAR - -/* - * fdrake says: - * Don't change the PyDoc_STR macro definition to (str), because - * '''the parentheses cause compile failures - * ("non-constant static initializer" or something like that) - * on some platforms (Irix?)''' - */ -#define PyDoc_STR(str) str -#define PyDoc_VAR(name) static char name[] -#define PyDoc_STRVAR(name,str) PyDoc_VAR(name) = PyDoc_STR(str) -#endif - #define FIX_TRACE enum HandlerTypes { |