diff options
Diffstat (limited to 'Build/source/texk/lcdf-typetools/lcdf-typetools-2.99-PATCHES/patch-30-W32TeX')
-rw-r--r-- | Build/source/texk/lcdf-typetools/lcdf-typetools-2.99-PATCHES/patch-30-W32TeX | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99-PATCHES/patch-30-W32TeX b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99-PATCHES/patch-30-W32TeX index 26c6df2aca7..7ff58fa02db 100644 --- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99-PATCHES/patch-30-W32TeX +++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99-PATCHES/patch-30-W32TeX @@ -87,29 +87,14 @@ diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetoo #endif diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.99.orig/otftotfm/otftotfm.cc lcdf-typetools-2.99/otftotfm/otftotfm.cc --- lcdf-typetools-2.99.orig/otftotfm/otftotfm.cc 2013-09-10 11:00:57.000000000 +0200 -+++ lcdf-typetools-2.99/otftotfm/otftotfm.cc 2013-09-10 19:13:50.000000000 +0200 -@@ -63,6 +63,10 @@ ++++ lcdf-typetools-2.99/otftotfm/otftotfm.cc 2013-09-17 09:24:09.000000000 +0200 +@@ -63,6 +63,9 @@ #ifdef HAVE_FCNTL_H # include <fcntl.h> #endif +#ifdef _MSC_VER +# include <io.h> -+#undef max +#endif using namespace Efont; -diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.99.orig/otftotfm/secondary.cc lcdf-typetools-2.99/otftotfm/secondary.cc ---- lcdf-typetools-2.99.orig/otftotfm/secondary.cc 2013-08-13 22:18:57.000000000 +0200 -+++ lcdf-typetools-2.99/otftotfm/secondary.cc 2013-09-10 19:13:50.000000000 +0200 -@@ -31,6 +31,10 @@ - #include <errno.h> - #include <limits.h> - #include <algorithm> -+#ifdef _MSC_VER -+#undef max -+#undef min -+#endif - - enum { - U_EXCLAMDOWN = 0x00A1, // U+00A1 INVERTED EXCLAMATION MARK |