merge 3.2

This commit is contained in:
Matthias Klose 2012-08-14 17:30:12 +02:00
commit 6ef977484d
1 changed files with 1 additions and 1 deletions

View File

@ -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