[Python-3000-checkins] r43218 - in python/branches/p3yk: Include/object.h Misc/NEWS Modules/_sre.c

[neal.norwitz]

Author: neal.norwitz
Date: Wed Mar 22 08:18:02 2006
New Revision: 43218

Modified:
   python/branches/p3yk/Include/object.h
   python/branches/p3yk/Misc/NEWS
   python/branches/p3yk/Modules/_sre.c
Log:
Remove staticforward and statichere

Modified: python/branches/p3yk/Include/object.h
==============================================================================
--- python/branches/p3yk/Include/object.h	(original)
+++ python/branches/p3yk/Include/object.h	Wed Mar 22 08:18:02 2006
@@ -685,21 +685,6 @@
  */
 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

Modified: python/branches/p3yk/Misc/NEWS
==============================================================================
--- python/branches/p3yk/Misc/NEWS	(original)
+++ python/branches/p3yk/Misc/NEWS	Wed Mar 22 08:18:02 2006
@@ -47,6 +47,8 @@
 
 - input(), raw_input() and apply() are gone.
 
+- Removed staticforward and statichere macros.
+
 Extension Modules
 -----------------
 

Modified: python/branches/p3yk/Modules/_sre.c
==============================================================================
--- python/branches/p3yk/Modules/_sre.c	(original)
+++ python/branches/p3yk/Modules/_sre.c	Wed Mar 22 08:18:02 2006
@@ -2770,7 +2770,7 @@
     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 @@
 /* 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 @@
     return NULL;
 }
 
-statichere PyTypeObject Scanner_Type = {
+static PyTypeObject Scanner_Type = {
     PyObject_HEAD_INIT(NULL)
     0, "_" SRE_MODULE ".SRE_Scanner",
     sizeof(ScannerObject), 0,