Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Moved the declaration of PySocketSock_Type from socketmodule.h to 

socketmodule.c.  No code outside of the .c file references it, so it
doesn't belong the .h file (at least not yet ...), and declaring it
an imported symbol in the .h file can't be made to work on Windows (it's
a cross-DLL symbol then) without substantial code rewriting.  Also
repaired the comment that goes along with the decl, to stop referring
to names and functions that haven't existed for 7 years <wink>.

socketmodule.c compiles cleanly on Windows again.  The test_socket dies
at once, though (later).
This commit is contained in:
Tim Peters 2002-02-17 04:13:21 +00:00
parent 6f5505aaf9
commit 643a7fc62f
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Modules/socketmodule.c
View File

@ -251,6 +251,11 @@ static PyObject *PyGAI_Error;
static int taskwindow; static int taskwindow;
#endif #endif
/* A forward reference to the socket type object.
The PySocketSock_Type variable contains pointers to various functions,
some of which call PySocketSock_New(), which uses PySocketSock_Type, so
there has to be a circular reference. */
staticforward PyTypeObject PySocketSock_Type;
/* Convenience function to raise an error according to errno /* Convenience function to raise an error according to errno
and return a NULL pointer from a function. */ and return a NULL pointer from a function. */

7
Modules/socketmodule.h
View File

@ -75,13 +75,6 @@ typedef struct {
sets a Python exception */ sets a Python exception */
} PySocketSockObject; } PySocketSockObject;
/* A forward reference to the Socktype type object.
The Socktype variable contains pointers to various functions,
some of which call newsockobject(), which uses Socktype, so
there has to be a circular reference. */
extern DL_IMPORT(PyTypeObject) PySocketSock_Type;
/* --- C API ----------------------------------------------------*/ /* --- C API ----------------------------------------------------*/
/* C API for usage by other Python modules */ /* C API for usage by other Python modules */