[Python-checkins] python/dist/src/Mac/Modules Nav.c,1.17,1.18 calldll.c,1.8,1.9 ctbmodule.c,1.13,1.14 hfsplusmodule.c,1.5,1.6 icgluemodule.c,1.9,1.10 macfsmodule.c,1.55,1.56 macosmodule.c,1.60,1.61 macspeechmodule.c,1.14,1.15

Wed, 17 Jul 2002 09:31:06 -0700

Update of /cvsroot/python/python/dist/src/Mac/Modules
In directory usw-pr-cvs1:/tmp/cvs-serv17711/Mac/Modules

Modified Files:
	Nav.c calldll.c ctbmodule.c hfsplusmodule.c icgluemodule.c 
	macfsmodule.c macosmodule.c macspeechmodule.c 
Log Message:
staticforward bites the dust.

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.)

I'm leaving staticforward and statichere defined in object.h as
static.  This is only for backwards compatibility with C extensions
that might still use it.

XXX I haven't updated the documentation.

Index: Nav.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/Nav.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Nav.c	22 May 2002 14:31:47 -0000	1.17
--- Nav.c	17 Jul 2002 16:30:34 -0000	1.18
***************
*** 234,238 ****
  } navrrobject;

! staticforward PyTypeObject Navrrtype;

--- 234,238 ----
  } navrrobject;

! static PyTypeObject Navrrtype;

Index: calldll.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/calldll.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** calldll.c	22 May 2002 14:31:47 -0000	1.8
--- calldll.c	17 Jul 2002 16:30:34 -0000	1.9
***************
*** 472,476 ****
  } cdfobject;

! staticforward PyTypeObject Cdftype;

--- 472,476 ----
  } cdfobject;

! static PyTypeObject Cdftype;

***************
*** 486,490 ****
  } cdrobject;

! staticforward PyTypeObject Cdrtype;

--- 486,490 ----
  } cdrobject;

! static PyTypeObject Cdrtype;

***************
*** 504,508 ****
  } cdcobject;

! staticforward PyTypeObject Cdctype;

--- 504,508 ----
  } cdcobject;

! static PyTypeObject Cdctype;

Index: ctbmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/ctbmodule.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** ctbmodule.c	22 May 2002 14:31:47 -0000	1.13
--- ctbmodule.c	17 Jul 2002 16:30:34 -0000	1.14
***************
*** 81,85 ****
  } ctbcmobject;

! staticforward PyTypeObject ctbcmtype;

  #define is_ctbcmobject(v)		((v)->ob_type == &ctbcmtype)
--- 81,85 ----
  } ctbcmobject;

! static PyTypeObject ctbcmtype;

  #define is_ctbcmobject(v)		((v)->ob_type == &ctbcmtype)

Index: hfsplusmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/hfsplusmodule.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** hfsplusmodule.c	8 Dec 2001 18:02:51 -0000	1.5
--- hfsplusmodule.c	17 Jul 2002 16:30:34 -0000	1.6
***************
*** 44,48 ****
  } forkRefObject;

! staticforward PyTypeObject forkRefObject_Type;

  #define forkRefObject_Check(v)	((v)->ob_type == &forkRefObject_Type)
--- 44,48 ----
  } forkRefObject;

! static PyTypeObject forkRefObject_Type;

  #define forkRefObject_Check(v)	((v)->ob_type == &forkRefObject_Type)
***************
*** 360,364 ****
  } iteratorObject;

! staticforward PyTypeObject iteratorObject_Type;

  #define iteratorObject_Check(v)	((v)->ob_type == &iteratorObject_Type)
--- 360,364 ----
  } iteratorObject;

! static PyTypeObject iteratorObject_Type;

  #define iteratorObject_Check(v)	((v)->ob_type == &iteratorObject_Type)
***************
*** 535,539 ****
  } fsRefObject;

! staticforward PyTypeObject fsRefObject_Type;

  #define fsRefObject_Check(v)	((v)->ob_type == &fsRefObject_Type)
--- 535,539 ----
  } fsRefObject;

! static PyTypeObject fsRefObject_Type;

  #define fsRefObject_Check(v)	((v)->ob_type == &fsRefObject_Type)

Index: icgluemodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/icgluemodule.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** icgluemodule.c	22 May 2002 14:31:47 -0000	1.9
--- icgluemodule.c	17 Jul 2002 16:30:34 -0000	1.10
***************
*** 62,66 ****
  } iciobject;

! staticforward PyTypeObject Icitype;

--- 62,66 ----
  } iciobject;

! static PyTypeObject Icitype;

Index: macfsmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/macfsmodule.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** macfsmodule.c	22 May 2002 14:31:48 -0000	1.55
--- macfsmodule.c	17 Jul 2002 16:30:34 -0000	1.56
***************
*** 71,75 ****
  } mfsaobject;

! staticforward PyTypeObject Mfsatype;

  #define is_mfsaobject(v)		((v)->ob_type == &Mfsatype)
--- 71,75 ----
  } mfsaobject;

! static PyTypeObject Mfsatype;

  #define is_mfsaobject(v)		((v)->ob_type == &Mfsatype)
***************
*** 83,87 ****
  } mfssobject;

! staticforward PyTypeObject Mfsstype;

  #define is_mfssobject(v)		((v)->ob_type == &Mfsstype)
--- 83,87 ----
  } mfssobject;

! static PyTypeObject Mfsstype;

  #define is_mfssobject(v)		((v)->ob_type == &Mfsstype)
***************
*** 95,99 ****
  } mfsrobject;

! staticforward PyTypeObject Mfsrtype;

  #define is_mfsrobject(v)		((v)->ob_type == &Mfsrtype)
--- 95,99 ----
  } mfsrobject;

! static PyTypeObject Mfsrtype;

  #define is_mfsrobject(v)		((v)->ob_type == &Mfsrtype)
***************
*** 108,118 ****
  } mfsiobject;

! staticforward PyTypeObject Mfsitype;

  #define is_mfsiobject(v)		((v)->ob_type == &Mfsitype)

! staticforward mfssobject *newmfssobject(FSSpec *fss); /* Forward */
! staticforward mfsrobject *newmfsrobject(FSRef *fsr); /* Forward */

  /* ---------------------------------------------------------------- */
--- 108,118 ----
  } mfsiobject;

! static PyTypeObject Mfsitype;

  #define is_mfsiobject(v)		((v)->ob_type == &Mfsitype)

! static mfssobject *newmfssobject(FSSpec *fss); /* Forward */
! static mfsrobject *newmfsrobject(FSRef *fsr); /* Forward */

  /* ---------------------------------------------------------------- */

Index: macosmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/macosmodule.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** macosmodule.c	22 May 2002 14:31:48 -0000	1.60
--- macosmodule.c	17 Jul 2002 16:30:34 -0000	1.61
***************
*** 61,65 ****
  } rfobject;

! staticforward PyTypeObject Rftype;

--- 61,65 ----
  } rfobject;

! static PyTypeObject Rftype;

Index: macspeechmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/macspeechmodule.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** macspeechmodule.c	22 May 2002 14:31:48 -0000	1.14
--- macspeechmodule.c	17 Jul 2002 16:30:34 -0000	1.15
***************
*** 89,93 ****
  } scobject;

! staticforward PyTypeObject sctype;

  #define is_scobject(v)		((v)->ob_type == &sctype)
--- 89,93 ----
  } scobject;

! static PyTypeObject sctype;

  #define is_scobject(v)		((v)->ob_type == &sctype)
***************
*** 286,290 ****
  } mvobject;

! staticforward PyTypeObject mvtype;

  #define is_mvobject(v)		((v)->ob_type == &mvtype)
--- 286,290 ----
  } mvobject;

! static PyTypeObject mvtype;

  #define is_mvobject(v)		((v)->ob_type == &mvtype)