From 8d5131a5f66d3a06c142bf8a9df77379f3a02fce Mon Sep 17 00:00:00 2001
From: Pietro Gagliardi <pietro10@mac.com>
Date: Sun, 31 May 2015 11:12:29 -0400
Subject: [PATCH] Split the Windows API #defines and #includes into its own
 file winapi.h so resources.rc can include it.

---
 redo/windows/GNUmakeinc.mk    |  3 ++-
 redo/windows/resources.rc     |  3 +--
 redo/windows/uipriv_windows.h | 27 +--------------------------
 redo/windows/winapi.h         | 27 +++++++++++++++++++++++++++
 4 files changed, 31 insertions(+), 29 deletions(-)
 create mode 100644 redo/windows/winapi.h

diff --git a/redo/windows/GNUmakeinc.mk b/redo/windows/GNUmakeinc.mk
index 36920ad4..7dfcd8d0 100644
--- a/redo/windows/GNUmakeinc.mk
+++ b/redo/windows/GNUmakeinc.mk
@@ -34,7 +34,8 @@ osCFILES = \
 
 osHFILES = \
 	windows/resources.h \
-	windows/uipriv_windows.h
+	windows/uipriv_windows.h \
+	windows/winapi.h
 
 osRCFILES = \
 	windows/resources.rc
diff --git a/redo/windows/resources.rc b/redo/windows/resources.rc
index 2470c797..988cb03f 100644
--- a/redo/windows/resources.rc
+++ b/redo/windows/resources.rc
@@ -1,6 +1,5 @@
 // 30 may 2015
-//TODO#include "winapi.h"
-#include <windows.h>
+#include "winapi.h"
 #include "resources.h"
 
 // this is a UTF-8 file
diff --git a/redo/windows/uipriv_windows.h b/redo/windows/uipriv_windows.h
index 9886e46c..640dad04 100644
--- a/redo/windows/uipriv_windows.h
+++ b/redo/windows/uipriv_windows.h
@@ -1,30 +1,5 @@
 // 6 january 2015
-#define UNICODE
-#define _UNICODE
-#define STRICT
-#define STRICT_TYPED_ITEMIDS
-#define CINTERFACE
-#define COBJMACROS
-// see https://github.com/golang/go/issues/9916#issuecomment-74812211
-#define INITGUID
-// get Windows version right; right now Windows XP
-#define WINVER 0x0501
-#define _WIN32_WINNT 0x0501
-#define _WIN32_WINDOWS 0x0501		/* according to Microsoft's winperf.h */
-#define _WIN32_IE 0x0600			/* according to Microsoft's sdkddkver.h */
-#define NTDDI_VERSION 0x05010000	/* according to Microsoft's sdkddkver.h */
-#include <windows.h>
-#include <commctrl.h>
-#include <stdint.h>
-#include <uxtheme.h>
-#include <string.h>
-#include <wchar.h>
-#include <windowsx.h>
-#include <vsstyle.h>
-#include <vssym32.h>
-#include <stdarg.h>
-#include <oleacc.h>
-#include <stdio.h>
+#include "winapi.h"
 #include "../out/ui.h"
 #include "../ui_windows.h"
 #include "../uipriv.h"
diff --git a/redo/windows/winapi.h b/redo/windows/winapi.h
new file mode 100644
index 00000000..a87bc155
--- /dev/null
+++ b/redo/windows/winapi.h
@@ -0,0 +1,27 @@
+// 31 may 2015
+#define UNICODE
+#define _UNICODE
+#define STRICT
+#define STRICT_TYPED_ITEMIDS
+#define CINTERFACE
+#define COBJMACROS
+// see https://github.com/golang/go/issues/9916#issuecomment-74812211
+#define INITGUID
+// get Windows version right; right now Windows XP
+#define WINVER 0x0501
+#define _WIN32_WINNT 0x0501
+#define _WIN32_WINDOWS 0x0501		/* according to Microsoft's winperf.h */
+#define _WIN32_IE 0x0600			/* according to Microsoft's sdkddkver.h */
+#define NTDDI_VERSION 0x05010000	/* according to Microsoft's sdkddkver.h */
+#include <windows.h>
+#include <commctrl.h>
+#include <stdint.h>
+#include <uxtheme.h>
+#include <string.h>
+#include <wchar.h>
+#include <windowsx.h>
+#include <vsstyle.h>
+#include <vssym32.h>
+#include <stdarg.h>
+#include <oleacc.h>
+#include <stdio.h>