Merge 3.2 to default

c53eb9df · Andrew Svetlov · aa0dbdc2 · 4092e365 · c53eb9df
Commit c53eb9df authored Aug 14, 2012 by Andrew Svetlov
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Modules/socketmodule.c Modules/socketmodule.c +1 -1

No files found.
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -840,7 +840,7 @@ new_sockobject(SOCKET_T fd, int family, int type, int proto)
 /* Lock to allow python interpreter to continue, but only allow one
   thread to be in gethostbyname or getaddrinfo */
 #if defined(USE_GETHOSTBYNAME_LOCK) || defined(USE_GETADDRINFO_LOCK)
-PyThread_type_lock netdb_lock;
+static PyThread_type_lock netdb_lock;
 #endif