summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Svetlov <andrew.svetlov@gmail.com>2012-08-14 15:41:40 (GMT)
committerAndrew Svetlov <andrew.svetlov@gmail.com>2012-08-14 15:41:40 (GMT)
commit4092e3653ce9bf35d22101732087e5b6ab4029c3 (patch)
tree9e263c34ef3f057303c567c056104ff4c7bd4e68
parentf3765071eb73ffb3630a64987f7dceddf64be2ea (diff)
parentd182a6c77e1b77e28d482e5fe92807f2d95469a6 (diff)
downloadcpython-4092e3653ce9bf35d22101732087e5b6ab4029c3.zip
cpython-4092e3653ce9bf35d22101732087e5b6ab4029c3.tar.gz
cpython-4092e3653ce9bf35d22101732087e5b6ab4029c3.tar.bz2
Merge 3.2
-rw-r--r--Modules/socketmodule.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 338622d..4f896fd 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -804,7 +804,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