summaryrefslogtreecommitdiff
path: root/Build/source/texk/kpathsea
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2014-06-20 07:32:40 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2014-06-20 07:32:40 +0000
commit6df7e1e8799ca6a4a95494ff1cf9ada0348c1d0b (patch)
tree39c7d2ffe0772f24b0e441ef2db12d7a9c107f9e /Build/source/texk/kpathsea
parent0d7d4c6df0be0f9b130fbddd045b5493032d291b (diff)
kpathsea: MinGW build fix
git-svn-id: svn://tug.org/texlive/trunk@34331 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/kpathsea')
-rw-r--r--Build/source/texk/kpathsea/ChangeLog4
-rw-r--r--Build/source/texk/kpathsea/mingw32.h10
2 files changed, 14 insertions, 0 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index f9df934866a..72633457487 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-20 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * mingw32.h: Require WINVER >= 0x0500.
+
2014-06-20 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
* win32lib.c: Fix a potential bug (w32 only).
diff --git a/Build/source/texk/kpathsea/mingw32.h b/Build/source/texk/kpathsea/mingw32.h
index e8147e5198a..f05935cef1d 100644
--- a/Build/source/texk/kpathsea/mingw32.h
+++ b/Build/source/texk/kpathsea/mingw32.h
@@ -18,15 +18,25 @@
#ifndef _MINGW32_H_
#define _MINGW32_H_
+/* We need GetLongPathName and perhaps others. */
+#if !defined WINVER || WINVER < 0x0500
+#undef WINVER
+#define WINVER 0x0500
+#endif
+
#include <stdlib.h>
/* The embedded rndnpc.h defines boolean as 'unsigned char',
and we do not want that.
This should be safe as long as we don't use npc ourselves. */
#define boolean saved_boolean
+/* With WINVER >= 0x0403 winuser.h declares INPUT as `struct tagINPUT`,
+ and we do not want that. */
+#define INPUT saved_INPUT
#include <windows.h>
#include <winerror.h>
#include <winnt.h>
#undef boolean
+#undef INPUT
#include <dirent.h>
#include <direct.h>
#include <fcntl.h>