merge 3.4 (#21089)

9effd1f5 · Benjamin Peterson · aa1403c4 · 93813439 · 9effd1f5
Kaydet (Commit) 9effd1f5 authored Mar 28, 2014 tarafından Benjamin Peterson
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

sysmodule.c Python/sysmodule.c +1 -0

No files found.
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -1799,6 +1799,7 @@ _PySys_Init(void)
 #endif
 #undef SET_SYS_FROM_STRING
+#undef SET_SYS_FROM_STRING_BORROW
    if (PyErr_Occurred())
        return NULL;
    return m;