summaryrefslogtreecommitdiff
path: root/Build/source/texk/lcdf-typetools
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2014-11-06 13:40:17 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2014-11-06 13:40:17 +0000
commitc08eff2883a952dd0f9325c51ad7968370452b02 (patch)
tree72080b810e039359df54696191cebf66f21d677b /Build/source/texk/lcdf-typetools
parente8386671e9408e3e71d63a518a5d8851689c3e7c (diff)
MinGW64 build: Fix minor glitches, avoid compiler warnings
git-svn-id: svn://tug.org/texlive/trunk@35527 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/lcdf-typetools')
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.104-PATCHES/ChangeLog4
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.104-PATCHES/patch-02-mingw6414
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.104/include/config.h1
3 files changed, 19 insertions, 0 deletions
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.104-PATCHES/ChangeLog b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.104-PATCHES/ChangeLog
index 00cdb181c7b..1aaa9375bf6 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.104-PATCHES/ChangeLog
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.104-PATCHES/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-06 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-02-mingw64 (new): Avoid MinGW64 warnings.
+
2014-11-05 Peter Breitenlohner <peb@mppmu.mpg.de>
* patch-01-win64 (new): Required for MinGW64.
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.104-PATCHES/patch-02-mingw64 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.104-PATCHES/patch-02-mingw64
new file mode 100644
index 00000000000..0c4eb654b3c
--- /dev/null
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.104-PATCHES/patch-02-mingw64
@@ -0,0 +1,14 @@
+ MinGW64 complains when <winsock2.h> is included after <windows.h>
+ (via include/efont/otfdata.hh).
+
+diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.104.orig/include/config.h lcdf-typetools-2.104/include/config.h
+--- lcdf-typetools-2.104.orig/include/config.h 2013-09-17 15:27:20.000000000 +0200
++++ lcdf-typetools-2.104/include/config.h 2014-11-06 11:47:10.000000000 +0100
+@@ -6,6 +6,7 @@
+ /* Allow compilation on Windows (thanks, Fabrice Popineau). */
+ #ifdef WIN32
+ # ifdef __MINGW32__
++# include <winsock2.h>
+ # include <windows.h>
+ # else
+ # include <win32lib.h>
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.104/include/config.h b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.104/include/config.h
index 26a90a97b14..18cab5cff07 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.104/include/config.h
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.104/include/config.h
@@ -6,6 +6,7 @@
/* Allow compilation on Windows (thanks, Fabrice Popineau). */
#ifdef WIN32
# ifdef __MINGW32__
+# include <winsock2.h>
# include <windows.h>
# else
# include <win32lib.h>