summaryrefslogtreecommitdiff
path: root/platform/x11
diff options
context:
space:
mode:
authorRobin Watts <robin.watts@artifex.com>2015-09-25 16:18:14 +0100
committerRobin Watts <robin.watts@artifex.com>2015-09-28 13:28:47 +0100
commitaf69c1326cd2bcc0c7c142abe0d7a374cf099448 (patch)
treecdd06a9014a1f28865796e492f6f9c4b67ae0771 /platform/x11
parent593e63dbdfdeecc73e26c0bc37b392243a935f54 (diff)
downloadmupdf-af69c1326cd2bcc0c7c142abe0d7a374cf099448.tar.xz
Bug 696169: Fix MINGW build of MuPDF.
Include pdfapp.h after the UNICODE defines to ensure that the correct version of the Windows string functions are used. Thanks to Tamir Evan for this workaround.
Diffstat (limited to 'platform/x11')
-rw-r--r--platform/x11/win_main.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/platform/x11/win_main.c b/platform/x11/win_main.c
index 467aa79a..0ab33c39 100644
--- a/platform/x11/win_main.c
+++ b/platform/x11/win_main.c
@@ -1,5 +1,3 @@
-#include "pdfapp.h"
-
#ifndef UNICODE
#define UNICODE
#endif
@@ -11,6 +9,9 @@
#include <commdlg.h>
#include <shellapi.h>
+/* Include pdfapp.h *AFTER* the UNICODE defines */
+#include "pdfapp.h"
+
#ifndef WM_MOUSEWHEEL
#define WM_MOUSEWHEEL 0x020A
#endif