summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Svetlov <andrew.svetlov@gmail.com>2012-08-14 15:42:10 (GMT)
committerAndrew Svetlov <andrew.svetlov@gmail.com>2012-08-14 15:42:10 (GMT)
commitc53eb9dfe226ba4db2d792f7c7bd8642dff1ad82 (patch)
treeb40afae15b1a4c0e6f304c7558c1c48b22cac484
parentaa0dbdc2ddb4cfe1669ac83a24673a8ef4ee1fc4 (diff)
parent4092e3653ce9bf35d22101732087e5b6ab4029c3 (diff)
downloadcpython-c53eb9dfe226ba4db2d792f7c7bd8642dff1ad82.zip
cpython-c53eb9dfe226ba4db2d792f7c7bd8642dff1ad82.tar.gz
cpython-c53eb9dfe226ba4db2d792f7c7bd8642dff1ad82.tar.bz2
Merge 3.2 to default
-rw-r--r--Modules/socketmodule.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 804e09e..7176674 100644
--- 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