1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
|
diff --git a/PC/pylauncher.rc b/PC/pylauncher.rc
index 92987af713..d21f9b6e9d 100644
--- a/PC/pylauncher.rc
+++ b/PC/pylauncher.rc
@@ -4,7 +4,6 @@
// Include the manifest file that indicates we support all
// current versions of Windows.
-#include <winuser.h>
1 RT_MANIFEST "python.manifest"
#if defined(PY_ICON)
diff --git a/PC/pyshellext.rc b/PC/pyshellext.rc
index e5924a42da..fc607e9784 100644
--- a/PC/pyshellext.rc
+++ b/PC/pyshellext.rc
@@ -4,7 +4,6 @@
// Include the manifest file that indicates we support all
// current versions of Windows.
-#include <winuser.h>
1 RT_MANIFEST "python.manifest"
/////////////////////////////////////////////////////////////////////////////
diff --git a/PC/python_exe.rc b/PC/python_exe.rc
index ae0b029b80..5eba89962b 100644
--- a/PC/python_exe.rc
+++ b/PC/python_exe.rc
@@ -4,7 +4,6 @@
// Include the manifest file that indicates we support all
// current versions of Windows.
-#include <winuser.h>
1 RT_MANIFEST "python.manifest"
1 ICON DISCARDABLE "icons\python.ico"
diff --git a/PC/python_nt.rc b/PC/python_nt.rc
index fac6105d8a..33cee42cb7 100644
--- a/PC/python_nt.rc
+++ b/PC/python_nt.rc
@@ -4,7 +4,6 @@
// Include the manifest file that indicates we support all
// current versions of Windows.
-#include <winuser.h>
2 RT_MANIFEST "python.manifest"
// String Tables
diff --git a/PC/pythonw_exe.rc b/PC/pythonw_exe.rc
index 88bf3592e1..562652be18 100644
--- a/PC/pythonw_exe.rc
+++ b/PC/pythonw_exe.rc
@@ -4,7 +4,6 @@
// Include the manifest file that indicates we support all
// current versions of Windows.
-#include <winuser.h>
1 RT_MANIFEST "python.manifest"
1 ICON DISCARDABLE "icons\pythonw.ico"
diff --git a/PC/sqlite3.rc b/PC/sqlite3.rc
index 84bd87d9d5..d2c18f8add 100644
--- a/PC/sqlite3.rc
+++ b/PC/sqlite3.rc
@@ -4,7 +4,6 @@
// Include the manifest file that indicates we support all
// current versions of Windows.
-#include <winuser.h>
2 RT_MANIFEST "python.manifest"
/////////////////////////////////////////////////////////////////////////////
diff --git a/PC/pylauncher.rc b/PC/pylauncher.rc
index d21f9b6e9d..ff7e71e0fd 100644
--- a/PC/pylauncher.rc
+++ b/PC/pylauncher.rc
@@ -2,6 +2,11 @@
#include "python_ver_rc.h"
+#ifndef RT_MANIFEST
+// bpo-45220: Cannot reliably #include RT_MANIFEST from
+// anywhere, so we hardcode it
+#define RT_MANIFEST 24
+#endif
// Include the manifest file that indicates we support all
// current versions of Windows.
1 RT_MANIFEST "python.manifest"
diff --git a/PC/pyshellext.rc b/PC/pyshellext.rc
index fc607e9784..af797ce95d 100644
--- a/PC/pyshellext.rc
+++ b/PC/pyshellext.rc
@@ -2,6 +2,12 @@
#include "python_ver_rc.h"
+#ifndef RT_MANIFEST
+// bpo-45220: Cannot reliably #include RT_MANIFEST from
+// anywhere, so we hardcode it
+#define RT_MANIFEST 24
+#endif
+
// Include the manifest file that indicates we support all
// current versions of Windows.
1 RT_MANIFEST "python.manifest"
diff --git a/PC/python_exe.rc b/PC/python_exe.rc
index 5eba89962b..c3d3bff019 100644
--- a/PC/python_exe.rc
+++ b/PC/python_exe.rc
@@ -2,6 +2,12 @@
#include "python_ver_rc.h"
+#ifndef RT_MANIFEST
+// bpo-45220: Cannot reliably #include RT_MANIFEST from
+// anywhere, so we hardcode it
+#define RT_MANIFEST 24
+#endif
+
// Include the manifest file that indicates we support all
// current versions of Windows.
1 RT_MANIFEST "python.manifest"
diff --git a/PC/python_nt.rc b/PC/python_nt.rc
index 33cee42cb7..539362cdc2 100644
--- a/PC/python_nt.rc
+++ b/PC/python_nt.rc
@@ -2,6 +2,12 @@
#include "python_ver_rc.h"
+#ifndef RT_MANIFEST
+// bpo-45220: Cannot reliably #include RT_MANIFEST from
+// anywhere, so we hardcode it
+#define RT_MANIFEST 24
+#endif
+
// Include the manifest file that indicates we support all
// current versions of Windows.
2 RT_MANIFEST "python.manifest"
diff --git a/PC/pythonw_exe.rc b/PC/pythonw_exe.rc
index 562652be18..38570b74fa 100644
--- a/PC/pythonw_exe.rc
+++ b/PC/pythonw_exe.rc
@@ -2,6 +2,12 @@
#include "python_ver_rc.h"
+#ifndef RT_MANIFEST
+// bpo-45220: Cannot reliably #include RT_MANIFEST from
+// anywhere, so we hardcode it
+#define RT_MANIFEST 24
+#endif
+
// Include the manifest file that indicates we support all
// current versions of Windows.
1 RT_MANIFEST "python.manifest"
diff --git a/PC/sqlite3.rc b/PC/sqlite3.rc
index d2c18f8add..9ae2aa0f6f 100644
--- a/PC/sqlite3.rc
+++ b/PC/sqlite3.rc
@@ -2,6 +2,12 @@
#include <winver.h>
+#ifndef RT_MANIFEST
+// bpo-45220: Cannot reliably #include RT_MANIFEST from
+// anywhere, so we hardcode it
+#define RT_MANIFEST 24
+#endif
+
// Include the manifest file that indicates we support all
// current versions of Windows.
2 RT_MANIFEST "python.manifest"
|
