Remove staticforward and statichere

diff --git a/Include/object.h b/Include/object.h
index 184d4c65f3e57ec6d5177615f21571dadf9cfeb8..573965149c1c5355a039436e14fdc3cc82176d48 100644 (file)
--- 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

diff --git a/Misc/NEWS b/Misc/NEWS
index 1595649bdcefd2d8b59ee4661f3071a1449b7317..3dce99d75a2f23b283412574d60ac6dee3c9aa83 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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 413ae09af5057fe6f430b03ce9a5d6388f0a542a..c16721074961590215f5f7f637cc289a68dcf027 100644 (file)
--- 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,