Fix Windows build

briancurtin · briancurtin · commit e6b299faf512 · 2012-04-14T14:19:33.000-05:00
diff --git a/Python/import.c b/Python/import.c
@@ -2963,7 +2963,7 @@ PyImport_ImportModuleLevelObject(PyObject *name, PyObject *given_globals,
         Py_INCREF(abs_name);
     }
 
-#if WITH_THREAD
+#ifdef WITH_THREAD
     _PyImport_AcquireLock();
 #endif
    /* From this point forward, goto error_with_unlock! */
@@ -2999,13 +2999,14 @@ PyImport_ImportModuleLevelObject(PyObject *name, PyObject *given_globals,
     if (PyObject_Not(fromlist)) {
         if (level == 0 || PyUnicode_GET_LENGTH(name) > 0) {
             PyObject *front = NULL;
+            PyObject *partition = NULL;
             PyObject *borrowed_dot = _PyUnicode_FromId(&single_dot);
 
             if (borrowed_dot == NULL) {
                 goto error_with_unlock;
             }
 
-            PyObject *partition = PyUnicode_Partition(name, borrowed_dot);
+            partition = PyUnicode_Partition(name, borrowed_dot);
             if (partition == NULL) {
                 goto error_with_unlock;
             }
@@ -3043,7 +3044,7 @@ PyImport_ImportModuleLevelObject(PyObject *name, PyObject *given_globals,
                                                   NULL);
     }
   error_with_unlock:
-#if WITH_THREAD
+#ifdef WITH_THREAD
     if (_PyImport_ReleaseLock() < 0) {
         PyErr_SetString(PyExc_RuntimeError, "not holding the import lock");
     }

Original file line number	Diff line number	Diff line change
`@@ -2963,7 +2963,7 @@ PyImport_ImportModuleLevelObject(PyObject name, PyObject given_globals,`
`2963`	`2963`	`Py_INCREF(abs_name);`
`2964`	`2964`	`}`
`2965`	`2965`
`2966`		`-#if WITH_THREAD`
	`2966`	`+#ifdef WITH_THREAD`
`2967`	`2967`	`_PyImport_AcquireLock();`
`2968`	`2968`	`#endif`
`2969`	`2969`	`/* From this point forward, goto error_with_unlock! */`
`@@ -2999,13 +2999,14 @@ PyImport_ImportModuleLevelObject(PyObject name, PyObject given_globals,`
`2999`	`2999`	`if (PyObject_Not(fromlist)) {`
`3000`	`3000`	`if (level == 0 \|\| PyUnicode_GET_LENGTH(name) > 0) {`
`3001`	`3001`	`PyObject *front = NULL;`
	`3002`	`+ PyObject *partition = NULL;`
`3002`	`3003`	`PyObject *borrowed_dot = _PyUnicode_FromId(&single_dot);`
`3003`	`3004`
`3004`	`3005`	`if (borrowed_dot == NULL) {`
`3005`	`3006`	`goto error_with_unlock;`
`3006`	`3007`	`}`
`3007`	`3008`
`3008`		`- PyObject *partition = PyUnicode_Partition(name, borrowed_dot);`
	`3009`	`+ partition = PyUnicode_Partition(name, borrowed_dot);`
`3009`	`3010`	`if (partition == NULL) {`
`3010`	`3011`	`goto error_with_unlock;`
`3011`	`3012`	`}`
`@@ -3043,7 +3044,7 @@ PyImport_ImportModuleLevelObject(PyObject name, PyObject given_globals,`
`3043`	`3044`	`NULL);`
`3044`	`3045`	`}`
`3045`	`3046`	`error_with_unlock:`
`3046`		`-#if WITH_THREAD`
	`3047`	`+#ifdef WITH_THREAD`
`3047`	`3048`	`if (_PyImport_ReleaseLock() < 0) {`
`3048`	`3049`	`PyErr_SetString(PyExc_RuntimeError, "not holding the import lock");`
`3049`	`3050`	`}`