diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-03-28 22:55:04 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-03-28 22:55:04 (GMT) |
| commit | 9effd1f5fb814fcdb6e8072e2afbf841bdb19d61 (patch) | |
| tree | de9f4a0cc6a891633c4230747bd95780b81f3334 /Python | |
| parent | aa1403c440dc1fce80ee08c790ed3c20ebea753e (diff) | |
| parent | 938134394837f3cac1f8cbe3c3bf4f53c5ce0379 (diff) | |
| download | cpython-9effd1f5fb814fcdb6e8072e2afbf841bdb19d61.zip cpython-9effd1f5fb814fcdb6e8072e2afbf841bdb19d61.tar.gz cpython-9effd1f5fb814fcdb6e8072e2afbf841bdb19d61.tar.bz2 | |
merge 3.4 (#21089)
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/sysmodule.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Python/sysmodule.c b/Python/sysmodule.c index 9ec3bfa..64de2bf 100644 --- 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; |