summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Klose <doko@ubuntu.com>2012-08-14 15:30:12 (GMT)
committerMatthias Klose <doko@ubuntu.com>2012-08-14 15:30:12 (GMT)
commit6ef977484d2b5aec52a99f26c803a1b9b28bcffd (patch)
treea6580e32e29dd106cdb3a93deae4b3e31de59bbc
parentf06afe35b9eca02cc99e77c19512841f2d889aef (diff)
parentd182a6c77e1b77e28d482e5fe92807f2d95469a6 (diff)
downloadcpython-6ef977484d2b5aec52a99f26c803a1b9b28bcffd.zip
cpython-6ef977484d2b5aec52a99f26c803a1b9b28bcffd.tar.gz
cpython-6ef977484d2b5aec52a99f26c803a1b9b28bcffd.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 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