Wed, 17 Jul 2002 09:30:40 -0700

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

Modified Files:
	_sre.c _ssl.c _tkinter.c almodule.c arraymodule.c 
	bsddbmodule.c cPickle.c cmathmodule.c dbmmodule.c dlmodule.c 
	flmodule.c fmmodule.c gdbmmodule.c linuxaudiodev.c md5module.c 
	mpzmodule.c parsermodule.c pcremodule.c pyexpat.c 
	rotormodule.c selectmodule.c shamodule.c socketmodule.c 
	sunaudiodev.c threadmodule.c xreadlinesmodule.c xxmodule.c 
	xxsubtype.c zlibmodule.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: _sre.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/_sre.c,v
retrieving revision 2.80
retrieving revision 2.81
diff -C2 -d -r2.80 -r2.81
*** _sre.c	13 Jun 2002 21:11:11 -0000	2.80
--- _sre.c	17 Jul 2002 16:30:35 -0000	2.81
***************
*** 1294,1300 ****
  /* see sre.h for object declarations */

! staticforward PyTypeObject Pattern_Type;
! staticforward PyTypeObject Match_Type;
! staticforward PyTypeObject Scanner_Type;

  static PyObject *
--- 1294,1300 ----
  /* see sre.h for object declarations */

! static PyTypeObject Pattern_Type;
! static PyTypeObject Match_Type;
! static PyTypeObject Scanner_Type;

  static PyObject *

Index: _ssl.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/_ssl.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** _ssl.c	2 Jul 2002 18:25:00 -0000	1.5
--- _ssl.c	17 Jul 2002 16:30:35 -0000	1.6
***************
*** 62,68 ****
  } PySSLObject;

! staticforward PyTypeObject PySSL_Type;
! staticforward PyObject *PySSL_SSLwrite(PySSLObject *self, PyObject *args);
! staticforward PyObject *PySSL_SSLread(PySSLObject *self, PyObject *args);

  #define PySSLObject_Check(v)	((v)->ob_type == &PySSL_Type)
--- 62,68 ----
  } PySSLObject;

! static PyTypeObject PySSL_Type;
! static PyObject *PySSL_SSLwrite(PySSLObject *self, PyObject *args);
! static PyObject *PySSL_SSLread(PySSLObject *self, PyObject *args);

  #define PySSLObject_Check(v)	((v)->ob_type == &PySSL_Type)
***************
*** 355,359 ****
  }

! staticforward PyTypeObject PySSL_Type = {
  	PyObject_HEAD_INIT(NULL)
  	0,				/*ob_size*/
--- 355,359 ----
  }

! static PyTypeObject PySSL_Type = {
  	PyObject_HEAD_INIT(NULL)
  	0,				/*ob_size*/

Index: _tkinter.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/_tkinter.c,v
retrieving revision 1.125
retrieving revision 1.126
diff -C2 -d -r1.125 -r1.126
*** _tkinter.c	4 Jun 2002 17:14:07 -0000	1.125
--- _tkinter.c	17 Jul 2002 16:30:35 -0000	1.126
***************
*** 187,191 ****
  int TkMacConvertEvent(EventRecord *eventPtr);

! staticforward int PyMacConvertEvent(EventRecord *eventPtr);

  #include <SIOUX.h>
--- 187,191 ----
  int TkMacConvertEvent(EventRecord *eventPtr);

! static int PyMacConvertEvent(EventRecord *eventPtr);

  #include <SIOUX.h>
***************
*** 200,204 ****
  /**** Tkapp Object Declaration ****/

! staticforward PyTypeObject Tkapp_Type;

  typedef struct {
--- 200,204 ----
  /**** Tkapp Object Declaration ****/

! static PyTypeObject Tkapp_Type;

  typedef struct {
***************
*** 1516,1520 ****
  /**** Tktt Object (timer token) ****/

! staticforward PyTypeObject Tktt_Type;

  typedef struct {
--- 1516,1520 ----
  /**** Tktt Object (timer token) ****/

! static PyTypeObject Tktt_Type;

  typedef struct {

Index: almodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/almodule.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** almodule.c	13 Jun 2002 20:32:48 -0000	1.36
--- almodule.c	17 Jul 2002 16:30:35 -0000	1.37
***************
*** 25,29 ****
  } alpobject;

! staticforward PyTypeObject Alptype;

--- 25,29 ----
  } alpobject;

! static PyTypeObject Alptype;

***************
*** 39,43 ****
  } alcobject;

! staticforward PyTypeObject Alctype;

--- 39,43 ----
  } alcobject;

! static PyTypeObject Alctype;

Index: arraymodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/arraymodule.c,v
retrieving revision 2.75
retrieving revision 2.76
diff -C2 -d -r2.75 -r2.76
*** arraymodule.c	19 Jun 2002 15:44:15 -0000	2.75
--- arraymodule.c	17 Jul 2002 16:30:36 -0000	2.76
***************
*** 36,40 ****
  } arrayobject;

! staticforward PyTypeObject Arraytype;

  #define array_Check(op) PyObject_TypeCheck(op, &Arraytype)
--- 36,40 ----
  } arrayobject;

! static PyTypeObject Arraytype;

  #define array_Check(op) PyObject_TypeCheck(op, &Arraytype)

Index: bsddbmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/bsddbmodule.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** bsddbmodule.c	23 Apr 2002 02:11:03 -0000	1.35
--- bsddbmodule.c	17 Jul 2002 16:30:36 -0000	1.36
***************
*** 40,44 ****
  } bsddbobject;

! staticforward PyTypeObject Bsddbtype;

  #define is_bsddbobject(v) ((v)->ob_type == &Bsddbtype)
--- 40,44 ----
  } bsddbobject;

! static PyTypeObject Bsddbtype;

  #define is_bsddbobject(v) ((v)->ob_type == &Bsddbtype)

Index: cPickle.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/cPickle.c,v
retrieving revision 2.89
retrieving revision 2.90
diff -C2 -d -r2.89 -r2.90
*** cPickle.c	16 Jul 2002 19:47:43 -0000	2.89
--- cPickle.c	17 Jul 2002 16:30:36 -0000	2.90
***************
*** 289,293 ****
  #endif

! staticforward PyTypeObject Picklertype;

  typedef struct Unpicklerobject {
--- 289,293 ----
  #endif

! static PyTypeObject Picklertype;

  typedef struct Unpicklerobject {
***************
*** 314,318 ****
  } Unpicklerobject;

! staticforward PyTypeObject Unpicklertype;

  /* Forward decls that need the above structs */
--- 314,318 ----
  } Unpicklerobject;

! static PyTypeObject Unpicklertype;

  /* Forward decls that need the above structs */

Index: cmathmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/cmathmodule.c,v
retrieving revision 2.30
retrieving revision 2.31
diff -C2 -d -r2.30 -r2.31
*** cmathmodule.c	13 Jun 2002 20:32:49 -0000	2.30
--- cmathmodule.c	17 Jul 2002 16:30:36 -0000	2.31
***************
*** 18,24 ****

  /* forward declarations */
! staticforward Py_complex c_log(Py_complex);
! staticforward Py_complex c_prodi(Py_complex);
! staticforward Py_complex c_sqrt(Py_complex);

--- 18,24 ----

  /* forward declarations */
! static Py_complex c_log(Py_complex);
! static Py_complex c_prodi(Py_complex);
! static Py_complex c_sqrt(Py_complex);

Index: dbmmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/dbmmodule.c,v
retrieving revision 2.30
retrieving revision 2.31
diff -C2 -d -r2.30 -r2.31
*** dbmmodule.c	14 Jun 2002 20:30:31 -0000	2.30
--- dbmmodule.c	17 Jul 2002 16:30:36 -0000	2.31
***************
*** 32,36 ****
  } dbmobject;

! staticforward PyTypeObject Dbmtype;

  #define is_dbmobject(v) ((v)->ob_type == &Dbmtype)
--- 32,36 ----
  } dbmobject;

! static PyTypeObject Dbmtype;

  #define is_dbmobject(v) ((v)->ob_type == &Dbmtype)

Index: dlmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/dlmodule.c,v
retrieving revision 2.21
retrieving revision 2.22
diff -C2 -d -r2.21 -r2.22
*** dlmodule.c	31 Mar 2002 15:43:28 -0000	2.21
--- dlmodule.c	17 Jul 2002 16:30:36 -0000	2.22
***************
*** 16,20 ****
  } dlobject;

! staticforward PyTypeObject Dltype;

  static PyObject *Dlerror;
--- 16,20 ----
  } dlobject;

! static PyTypeObject Dltype;

  static PyObject *Dlerror;

Index: flmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/flmodule.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** flmodule.c	31 Mar 2002 15:56:56 -0000	1.49
--- flmodule.c	17 Jul 2002 16:30:36 -0000	1.50
***************
*** 30,34 ****
  } genericobject;

! staticforward PyTypeObject GenericObjecttype;

  #define is_genericobject(g) ((g)->ob_type == &GenericObjecttype)
--- 30,34 ----
  } genericobject;

! static PyTypeObject GenericObjecttype;

  #define is_genericobject(g) ((g)->ob_type == &GenericObjecttype)
***************
*** 1190,1194 ****
  } formobject;

! staticforward PyTypeObject Formtype;

  #define is_formobject(v) ((v)->ob_type == &Formtype)
--- 1190,1194 ----
  } formobject;

! static PyTypeObject Formtype;

  #define is_formobject(v) ((v)->ob_type == &Formtype)

Index: fmmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/fmmodule.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** fmmodule.c	31 Mar 2002 14:57:24 -0000	1.20
--- fmmodule.c	17 Jul 2002 16:30:36 -0000	1.21
***************
*** 16,20 ****
  } fhobject;

! staticforward PyTypeObject Fhtype;

  #define is_fhobject(v)		((v)->ob_type == &Fhtype)
--- 16,20 ----
  } fhobject;

! static PyTypeObject Fhtype;

  #define is_fhobject(v)		((v)->ob_type == &Fhtype)

Index: gdbmmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/gdbmmodule.c,v
retrieving revision 2.33
retrieving revision 2.34
diff -C2 -d -r2.33 -r2.34
*** gdbmmodule.c	13 Jun 2002 20:32:49 -0000	2.33
--- gdbmmodule.c	17 Jul 2002 16:30:36 -0000	2.34
***************
*** 35,39 ****
  } dbmobject;

! staticforward PyTypeObject Dbmtype;

  #define is_dbmobject(v) ((v)->ob_type == &Dbmtype)
--- 35,39 ----
  } dbmobject;

! static PyTypeObject Dbmtype;

  #define is_dbmobject(v) ((v)->ob_type == &Dbmtype)

Index: linuxaudiodev.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/linuxaudiodev.c,v
retrieving revision 2.18
retrieving revision 2.19
diff -C2 -d -r2.18 -r2.19
*** linuxaudiodev.c	27 Apr 2002 18:44:31 -0000	2.18
--- linuxaudiodev.c	17 Jul 2002 16:30:36 -0000	2.19
***************
*** 71,75 ****
  static int n_audio_types = sizeof(audio_types) / sizeof(audio_types[0]);

! staticforward PyTypeObject Ladtype;

  static PyObject *LinuxAudioError;
--- 71,75 ----
  static int n_audio_types = sizeof(audio_types) / sizeof(audio_types[0]);

! static PyTypeObject Ladtype;

  static PyObject *LinuxAudioError;

Index: md5module.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/md5module.c,v
retrieving revision 2.30
retrieving revision 2.31
diff -C2 -d -r2.30 -r2.31
*** md5module.c	13 Jun 2002 20:32:50 -0000	2.30
--- md5module.c	17 Jul 2002 16:30:37 -0000	2.31
***************
*** 18,22 ****
  } md5object;

! staticforward PyTypeObject MD5type;

  #define is_md5object(v)		((v)->ob_type == &MD5type)
--- 18,22 ----
  } md5object;

! static PyTypeObject MD5type;

  #define is_md5object(v)		((v)->ob_type == &MD5type)

Index: mpzmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/mpzmodule.c,v
retrieving revision 2.43
retrieving revision 2.44
diff -C2 -d -r2.43 -r2.44
*** mpzmodule.c	1 Apr 2002 01:37:14 -0000	2.43
--- mpzmodule.c	17 Jul 2002 16:30:37 -0000	2.44
***************
*** 76,80 ****
  } mpzobject;

! staticforward PyTypeObject MPZtype;

  #define is_mpzobject(v)		((v)->ob_type == &MPZtype)
--- 76,80 ----
  } mpzobject;

! static PyTypeObject MPZtype;

  #define is_mpzobject(v)		((v)->ob_type == &MPZtype)

Index: parsermodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/parsermodule.c,v
retrieving revision 2.70
retrieving revision 2.71
diff -C2 -d -r2.70 -r2.71
*** parsermodule.c	13 Jun 2002 20:32:50 -0000	2.70
--- parsermodule.c	17 Jul 2002 16:30:37 -0000	2.71
***************
*** 158,169 ****

! staticforward void
! parser_free(PyST_Object *st);
! 
! staticforward int
! parser_compare(PyST_Object *left, PyST_Object *right);
! 
! staticforward PyObject *
! parser_getattr(PyObject *self, char *name);

--- 158,164 ----

! static void parser_free(PyST_Object *st);
! static int parser_compare(PyST_Object *left, PyST_Object *right);
! static PyObject *parser_getattr(PyObject *self, char *name);

***************
*** 551,557 ****

! staticforward node* build_node_tree(PyObject *tuple);
! staticforward int   validate_expr_tree(node *tree);
! staticforward int   validate_file_input(node *tree);

--- 546,552 ----

! static node* build_node_tree(PyObject *tuple);
! static int   validate_expr_tree(node *tree);
! static int   validate_file_input(node *tree);

***************
*** 794,798 ****
   *  Validation routines used within the validation section:
   */
! staticforward int validate_terminal(node *terminal, int type, char *string);

  #define validate_ampersand(ch)  validate_terminal(ch,      AMPER, "&")
--- 789,793 ----
   *  Validation routines used within the validation section:
   */
! static int validate_terminal(node *terminal, int type, char *string);

  #define validate_ampersand(ch)  validate_terminal(ch,      AMPER, "&")

Index: pcremodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/pcremodule.c,v
retrieving revision 2.31
retrieving revision 2.32
diff -C2 -d -r2.31 -r2.32
*** pcremodule.c	17 Jan 2002 23:15:58 -0000	2.31
--- pcremodule.c	17 Jul 2002 16:30:37 -0000	2.32
***************
*** 25,29 ****
  } PcreObject;

! staticforward PyTypeObject Pcre_Type;

  #define PcreObject_Check(v)	((v)->ob_type == &Pcre_Type)
--- 25,29 ----
  } PcreObject;

! static PyTypeObject Pcre_Type;

  #define PcreObject_Check(v)	((v)->ob_type == &Pcre_Type)
***************
*** 126,130 ****

! staticforward PyTypeObject Pcre_Type = {
  	PyObject_HEAD_INIT(NULL)
  	0,			/*ob_size*/
--- 126,130 ----

! static PyTypeObject Pcre_Type = {
  	PyObject_HEAD_INIT(NULL)
  	0,			/*ob_size*/

Index: pyexpat.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/pyexpat.c,v
retrieving revision 2.67
retrieving revision 2.68
diff -C2 -d -r2.67 -r2.68
*** pyexpat.c	2 Jul 2002 15:44:36 -0000	2.67
--- pyexpat.c	17 Jul 2002 16:30:37 -0000	2.68
***************
*** 67,71 ****
  #define CHARACTER_DATA_BUFFER_SIZE 8192

! staticforward PyTypeObject Xmlparsetype;

  typedef void (*xmlhandlersetter)(XML_Parser *self, void *meth);
--- 67,71 ----
  #define CHARACTER_DATA_BUFFER_SIZE 8192

! static PyTypeObject Xmlparsetype;

  typedef void (*xmlhandlersetter)(XML_Parser *self, void *meth);
***************
*** 80,84 ****
  };

! staticforward struct HandlerInfo handler_info[64];

  /* Set an integer attribute on the error object; return true on success,
--- 80,84 ----
  };

! static struct HandlerInfo handler_info[64];

  /* Set an integer attribute on the error object; return true on success,

Index: rotormodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/rotormodule.c,v
retrieving revision 2.34
retrieving revision 2.35
diff -C2 -d -r2.34 -r2.35
*** rotormodule.c	10 Jun 2002 19:46:18 -0000	2.34
--- rotormodule.c	17 Jul 2002 16:30:37 -0000	2.35
***************
*** 79,83 ****
  } Rotorobj;

! staticforward PyTypeObject Rotor_Type;

  #define is_rotor(v)		((v)->ob_type == &Rotor_Type)
--- 79,83 ----
  } Rotorobj;

! static PyTypeObject Rotor_Type;

  #define is_rotor(v)		((v)->ob_type == &Rotor_Type)

Index: selectmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/selectmodule.c,v
retrieving revision 2.64
retrieving revision 2.65
diff -C2 -d -r2.64 -r2.65
*** selectmodule.c	13 Jun 2002 20:32:52 -0000	2.64
--- selectmodule.c	17 Jul 2002 16:30:37 -0000	2.65
***************
*** 323,327 ****
  } pollObject;

! staticforward PyTypeObject poll_Type;

  /* Update the malloc'ed array of pollfds to match the dictionary 
--- 323,327 ----
  } pollObject;

! static PyTypeObject poll_Type;

  /* Update the malloc'ed array of pollfds to match the dictionary 

Index: shamodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/shamodule.c,v
retrieving revision 2.19
retrieving revision 2.20
diff -C2 -d -r2.19 -r2.20
*** shamodule.c	13 Jun 2002 20:32:52 -0000	2.19
--- shamodule.c	17 Jul 2002 16:30:37 -0000	2.20
***************
*** 331,335 ****
   */

! staticforward PyTypeObject SHAtype;

--- 331,335 ----
   */

! static PyTypeObject SHAtype;

Index: socketmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/socketmodule.c,v
retrieving revision 1.229
retrieving revision 1.230
diff -C2 -d -r1.229 -r1.230
*** socketmodule.c	2 Jul 2002 14:40:42 -0000	1.229
--- socketmodule.c	17 Jul 2002 16:30:37 -0000	1.230
***************
*** 277,281 ****
     some of which call new_sockobject(), which uses sock_type, so
     there has to be a circular reference. */
! staticforward PyTypeObject sock_type;

  /* Convenience function to raise an error according to errno
--- 277,281 ----
     some of which call new_sockobject(), which uses sock_type, so
     there has to be a circular reference. */
! static PyTypeObject sock_type;

  /* Convenience function to raise an error according to errno

Index: sunaudiodev.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/sunaudiodev.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** sunaudiodev.c	31 Mar 2002 15:27:00 -0000	1.29
--- sunaudiodev.c	17 Jul 2002 16:30:37 -0000	1.30
***************
*** 37,42 ****
  } sadstatusobject;

! staticforward PyTypeObject Sadtype;
! staticforward PyTypeObject Sadstatustype;
  static sadstatusobject *sads_alloc(void);	/* Forward */

--- 37,42 ----
  } sadstatusobject;

! static PyTypeObject Sadtype;
! static PyTypeObject Sadstatustype;
  static sadstatusobject *sads_alloc(void);	/* Forward */

Index: threadmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/threadmodule.c,v
retrieving revision 2.50
retrieving revision 2.51
diff -C2 -d -r2.50 -r2.51
*** threadmodule.c	13 Jun 2002 20:32:53 -0000	2.50
--- threadmodule.c	17 Jul 2002 16:30:37 -0000	2.51
***************
*** 23,27 ****
  } lockobject;

! staticforward PyTypeObject Locktype;

  static lockobject *
--- 23,27 ----
  } lockobject;

! static PyTypeObject Locktype;

  static lockobject *

Index: xreadlinesmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/xreadlinesmodule.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** xreadlinesmodule.c	13 Jun 2002 20:32:53 -0000	1.10
--- xreadlinesmodule.c	17 Jul 2002 16:30:37 -0000	1.11
***************
*** 15,19 ****
  } PyXReadlinesObject;

! staticforward PyTypeObject XReadlinesObject_Type;

  static void
--- 15,19 ----
  } PyXReadlinesObject;

! static PyTypeObject XReadlinesObject_Type;

  static void

Index: xxmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/xxmodule.c,v
retrieving revision 2.28
retrieving revision 2.29
diff -C2 -d -r2.28 -r2.29
*** xxmodule.c	23 May 2002 15:49:38 -0000	2.28
--- xxmodule.c	17 Jul 2002 16:30:37 -0000	2.29
***************
*** 24,28 ****
  } XxoObject;

! staticforward PyTypeObject Xxo_Type;

  #define XxoObject_Check(v)	((v)->ob_type == &Xxo_Type)
--- 24,28 ----
  } XxoObject;

! static PyTypeObject Xxo_Type;

  #define XxoObject_Check(v)	((v)->ob_type == &Xxo_Type)

Index: xxsubtype.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/xxsubtype.c,v
retrieving revision 2.15
retrieving revision 2.16
diff -C2 -d -r2.15 -r2.16
*** xxsubtype.c	13 Jun 2002 20:32:54 -0000	2.15
--- xxsubtype.c	17 Jul 2002 16:30:37 -0000	2.16
***************
*** 80,84 ****
  };

! staticforward PyTypeObject spamlist_type;

  static int
--- 80,84 ----
  };

! static PyTypeObject spamlist_type;

  static int
***************
*** 180,184 ****
  };

! staticforward PyTypeObject spamdict_type;

  static int
--- 180,184 ----
  };

! static PyTypeObject spamdict_type;

  static int

Index: zlibmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/zlibmodule.c,v
retrieving revision 2.62
retrieving revision 2.63
diff -C2 -d -r2.62 -r2.63
*** zlibmodule.c	13 Jun 2002 20:32:54 -0000	2.62
--- zlibmodule.c	17 Jul 2002 16:30:37 -0000	2.63
***************
*** 56,61 ****
  #define PyInit_zlib initzlib

! staticforward PyTypeObject Comptype;
! staticforward PyTypeObject Decomptype;

  static PyObject *ZlibError;
--- 56,61 ----
  #define PyInit_zlib initzlib

! static PyTypeObject Comptype;
! static PyTypeObject Decomptype;

  static PyObject *ZlibError;