Fixed #1508 Removal of stale code in _csv.c / pyexpat.c

Credits belong to Joseph Armbruster

diff --git a/Modules/_csv.c b/Modules/_csv.c
index 596d5c2c01fd00bbd8b7730313f1ac91e34d6fbe..7936597025b137202387085d8dcc2a7e365bf38f 100644 (file)
--- 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 b18e3716465f1895510393d4a15fc669308c8d8e..738bfd261bacfa63d1b6fee96e4c02dbe8585260 100644 (file)
--- 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 {