[Python-checkins] CVS: python/dist/src/Modules cPickle.c,2.67,2.68 socketmodule.c,1.194,1.195

[Michael Hudson]

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

Modified Files:
	cPickle.c socketmodule.c 
Log Message:
Fixes to compile cPickle.c & socketmodule.c on cygwin and possibly
other platforms that have funny ideas about whether addresses of
functions in dlls are compile-time constants. 



Index: cPickle.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/cPickle.c,v
retrieving revision 2.67
retrieving revision 2.68
diff -C2 -d -r2.67 -r2.68
*** cPickle.c	2001/10/16 17:10:49	2.67
--- cPickle.c	2001/11/09 10:06:23	2.68
***************
*** 2495,2500 ****
      0,					/* tp_call */
      0,					/* tp_str */
!     PyObject_GenericGetAttr,		/* tp_getattro */
!     PyObject_GenericSetAttr,		/* tp_setattro */
      0,					/* tp_as_buffer */
      Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
--- 2495,2500 ----
      0,					/* tp_call */
      0,					/* tp_str */
!     0,	/* set below */			/* tp_getattro */
!     0,	/* set below */			/* tp_setattro */
      0,					/* tp_as_buffer */
      Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
***************
*** 4669,4672 ****
--- 4669,4674 ----
  
      Picklertype.ob_type = &PyType_Type;
+     Picklertype.tp_getattro = PyObject_GenericGetAttr;
+     Picklertype.tp_setattro = PyObject_GenericSetAttr;
      Unpicklertype.ob_type = &PyType_Type;
      PdataType.ob_type = &PyType_Type;

Index: socketmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/socketmodule.c,v
retrieving revision 1.194
retrieving revision 1.195
diff -C2 -d -r1.194 -r1.195
*** socketmodule.c	2001/11/07 08:31:03	1.194
--- socketmodule.c	2001/11/09 10:06:23	1.195
***************
*** 1878,1882 ****
  	0,					/* tp_call */
  	0,					/* tp_str */
! 	PyObject_GenericGetAttr,		/* tp_getattro */
  	0,					/* tp_setattro */
  	0,					/* tp_as_buffer */
--- 1878,1882 ----
  	0,					/* tp_call */
  	0,					/* tp_str */
! 	0,	/* set below */			/* tp_getattro */
  	0,					/* tp_setattro */
  	0,					/* tp_as_buffer */
***************
*** 1898,1904 ****
  	0,					/* tp_dictoffset */
  	PySocketSock_init,			/* tp_init */
! 	PyType_GenericAlloc,			/* tp_alloc */
  	PySocketSock_new,			/* tp_new */
! 	_PyObject_Del,				/* tp_free */
  };
  
--- 1898,1904 ----
  	0,					/* tp_dictoffset */
  	PySocketSock_init,			/* tp_init */
! 	0,	/* set below */			/* tp_alloc */
  	PySocketSock_new,			/* tp_new */
! 	0,	/* set below */			/* tp_free */
  };
  
***************
*** 3134,3137 ****
--- 3134,3140 ----
  #endif /* RISCOS */
  	PySocketSock_Type.ob_type = &PyType_Type;
+ 	PySocketSock_Type.tp_getattro = PyObject_GenericGetAttr;
+ 	PySocketSock_Type.tp_alloc = PyType_GenericAlloc;
+ 	PySocketSock_Type.tp_free = _PyObject_Del;
  #ifdef USE_SSL
  	PySSL_Type.ob_type = &PyType_Type;