[Python-checkins] cpython (merge 3.2 -> default): Merge 3.2 to default

[andrew.svetlov]

http://hg.python.org/cpython/rev/ff1dbee53cb2
changeset:   78574:ff1dbee53cb2
parent:      78572:9d86480cc177
parent:      78573:84899daa4309
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Tue Aug 14 18:42:10 2012 +0300
summary:
  Merge 3.2 to default

files:
  Modules/socketmodule.c |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -840,7 +840,7 @@
 /* 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
 
 

-- 
Repository URL: http://hg.python.org/cpython