python3: Rebase patches onto 3.4.2
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
diff -Naur a/Include/osdefs.h b/Include/osdefs.h
|
||||
--- a/Include/osdefs.h 2014-05-20 00:56:20.381200000 +0400
|
||||
+++ b/Include/osdefs.h 2014-05-20 00:56:57.790000000 +0400
|
||||
diff -urN a/Include/osdefs.h b/Include/osdefs.h
|
||||
--- a/Include/osdefs.h 2014-10-11 14:23:05.655352800 +0100
|
||||
+++ b/Include/osdefs.h 2014-10-11 14:23:07.572462400 +0100
|
||||
@@ -17,7 +17,6 @@
|
||||
#define SEP L'\\'
|
||||
#define ALTSEP L'/'
|
||||
@@ -9,9 +9,9 @@ diff -Naur a/Include/osdefs.h b/Include/osdefs.h
|
||||
#define DELIM L';'
|
||||
#define DELIMSTR ";"
|
||||
#endif
|
||||
diff -Naur a/Modules/main.c b/Modules/main.c
|
||||
--- a/Modules/main.c 2014-05-19 09:19:39.000000000 +0400
|
||||
+++ b/Modules/main.c 2014-05-20 00:56:57.790000000 +0400
|
||||
diff -urN a/Modules/main.c b/Modules/main.c
|
||||
--- a/Modules/main.c 2014-10-11 14:23:05.736357400 +0100
|
||||
+++ b/Modules/main.c 2014-10-11 14:23:07.573462500 +0100
|
||||
@@ -9,7 +9,6 @@
|
||||
#include <windows.h>
|
||||
#ifdef HAVE_FCNTL_H
|
||||
@@ -20,9 +20,9 @@ diff -Naur a/Modules/main.c b/Modules/main.c
|
||||
#endif
|
||||
#endif
|
||||
|
||||
diff -Naur a/Python/pythonrun.c b/Python/pythonrun.c
|
||||
--- a/Python/pythonrun.c 2014-05-20 00:56:20.396800000 +0400
|
||||
+++ b/Python/pythonrun.c 2014-05-20 00:56:57.790000000 +0400
|
||||
diff -urN a/Python/pythonrun.c b/Python/pythonrun.c
|
||||
--- a/Python/pythonrun.c 2014-10-11 14:23:04.818304900 +0100
|
||||
+++ b/Python/pythonrun.c 2014-10-11 14:23:07.574462500 +0100
|
||||
@@ -32,7 +32,6 @@
|
||||
#ifdef MS_WINDOWS
|
||||
#undef BYTE
|
||||
|
||||
Reference in New Issue
Block a user