diff options
| -rw-r--r-- | Include/object.h | 15 | ||||
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | Modules/_sre.c | 6 |
3 files changed, 5 insertions, 18 deletions
diff --git a/Include/object.h b/Include/object.h index 184d4c6..5739651 100644 --- a/Include/object.h +++ b/Include/object.h @@ -685,21 +685,6 @@ PyAPI_DATA(PyObject) _Py_NotImplementedStruct; /* Don't use this directly */ */ PyAPI_DATA(int) _Py_SwappedOp[]; -/* -Define staticforward and statichere for source compatibility with old -C extensions. - -The staticforward define was needed to support certain broken C -compilers (notably SCO ODT 3.0, perhaps early AIX as well) botched the -static keyword when it was used with a forward declaration of a static -initialized structure. Standard C allows the forward declaration with -static, and we've decided to stop catering to broken C compilers. -(In fact, we expect that the compilers are all fixed eight years later.) -*/ - -#define staticforward static -#define statichere static - /* More conventions @@ -47,6 +47,8 @@ Core and Builtins - input(), raw_input() and apply() are gone. +- Removed staticforward and statichere macros. + Extension Modules ----------------- diff --git a/Modules/_sre.c b/Modules/_sre.c index 413ae09..c167210 100644 --- a/Modules/_sre.c +++ b/Modules/_sre.c @@ -2770,7 +2770,7 @@ pattern_getattr(PatternObject* self, char* name) return NULL; } -statichere PyTypeObject Pattern_Type = { +static PyTypeObject Pattern_Type = { PyObject_HEAD_INIT(NULL) 0, "_" SRE_MODULE ".SRE_Pattern", sizeof(PatternObject), sizeof(SRE_CODE), @@ -3251,7 +3251,7 @@ match_getattr(MatchObject* self, char* name) /* FIXME: implement setattr("string", None) as a special case (to detach the associated string, if any */ -statichere PyTypeObject Match_Type = { +static PyTypeObject Match_Type = { PyObject_HEAD_INIT(NULL) 0, "_" SRE_MODULE ".SRE_Match", sizeof(MatchObject), sizeof(int), @@ -3361,7 +3361,7 @@ scanner_getattr(ScannerObject* self, char* name) return NULL; } -statichere PyTypeObject Scanner_Type = { +static PyTypeObject Scanner_Type = { PyObject_HEAD_INIT(NULL) 0, "_" SRE_MODULE ".SRE_Scanner", sizeof(ScannerObject), 0, |