commit 787269797e92e44d3edeab5d8dd0436170748e7e
author Benjamin Peterson <benjamin@python.org> Tue Sep 11 12:05:18 2012 -0400
committer Benjamin Peterson <benjamin@python.org> Tue Sep 11 12:05:18 2012 -0400
tree eacf0f5457e1098d4327db7b205209fd7bb4a7ce
parent 6f3e5e48d37388f820642f3f71dcc8da4c79ad19
parent e9a6d62d9fb6f0e88318a4279b54288b5ab08ee3

merge heads

Modules/selectmodule.c

diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
index 5b5eb92..7cec49b 100644
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -239,7 +239,7 @@
 #else
         /* 64-bit OS X has struct timeval.tv_usec as an int (and thus still 4
            bytes as required), but no longer defined by a long. */
-        long tv_usec = tv.tv_usec;
+        long tv_usec;
         if (_PyTime_ObjectToTimeval(tout, &tv.tv_sec, &tv_usec) == -1)
             return NULL;
         tv.tv_usec = tv_usec;