diff options
| author | Michael W. Hudson <mwh@python.net> | 2001-11-09 10:06:23 (GMT) |
|---|---|---|
| committer | Michael W. Hudson <mwh@python.net> | 2001-11-09 10:06:23 (GMT) |
| commit | 03f96bd8f5c7b93c8836ce5219b075c70e240927 (patch) | |
| tree | a3bbb10f9db4c21c3fe1f1018858e74afe121c62 | |
| parent | 30bd666c353a46cc481d8e4444b70f186a1d791b (diff) | |
| download | cpython-03f96bd8f5c7b93c8836ce5219b075c70e240927.zip cpython-03f96bd8f5c7b93c8836ce5219b075c70e240927.tar.gz cpython-03f96bd8f5c7b93c8836ce5219b075c70e240927.tar.bz2 | |
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.
| -rw-r--r-- | Modules/cPickle.c | 6 | ||||
| -rw-r--r-- | Modules/socketmodule.c | 9 |
2 files changed, 10 insertions, 5 deletions
diff --git a/Modules/cPickle.c b/Modules/cPickle.c index b2392f9..f8a3c1c 100644 --- a/Modules/cPickle.c +++ b/Modules/cPickle.c @@ -2494,8 +2494,8 @@ static PyTypeObject Picklertype = { 0, /* tp_hash */ 0, /* tp_call */ 0, /* tp_str */ - PyObject_GenericGetAttr, /* tp_getattro */ - PyObject_GenericSetAttr, /* tp_setattro */ + 0, /* set below */ /* tp_getattro */ + 0, /* set below */ /* tp_setattro */ 0, /* tp_as_buffer */ Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ Picklertype__doc__, /* tp_doc */ @@ -4668,6 +4668,8 @@ initcPickle(void) { PyObject *compatible_formats; 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; diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index 601880e..2a62f5d 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -1877,7 +1877,7 @@ static PyTypeObject PySocketSock_Type = { 0, /* tp_hash */ 0, /* tp_call */ 0, /* tp_str */ - PyObject_GenericGetAttr, /* tp_getattro */ + 0, /* set below */ /* tp_getattro */ 0, /* tp_setattro */ 0, /* tp_as_buffer */ Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ @@ -1897,9 +1897,9 @@ static PyTypeObject PySocketSock_Type = { 0, /* tp_descr_set */ 0, /* tp_dictoffset */ PySocketSock_init, /* tp_init */ - PyType_GenericAlloc, /* tp_alloc */ + 0, /* set below */ /* tp_alloc */ PySocketSock_new, /* tp_new */ - _PyObject_Del, /* tp_free */ + 0, /* set below */ /* tp_free */ }; @@ -3133,6 +3133,9 @@ init_socket(void) #endif /* MS_WINDOWS */ #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; #endif |