summaryrefslogtreecommitdiff
path: root/Build/source/texk/lcdf-typetools
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2013-09-17 07:43:40 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2013-09-17 07:43:40 +0000
commitf45847453d43449bfd1a646be4d88066f92a25a4 (patch)
tree3c14fbebdaeb891f36ef1292f66994f51f1977ab /Build/source/texk/lcdf-typetools
parent67c10b5134717c5242a9e51b853c8b8c37c6219a (diff)
dvisvgm, lcdf-typetools: Simplify changes for Visual Studio 2010 (from Akira)
git-svn-id: svn://tug.org/texlive/trunk@31677 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/lcdf-typetools')
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.99-PATCHES/ChangeLog5
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.99-PATCHES/patch-30-W32TeX19
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otftotfm/otftotfm.cc1
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otftotfm/secondary.cc4
4 files changed, 7 insertions, 22 deletions
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99-PATCHES/ChangeLog b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99-PATCHES/ChangeLog
index cc6289f933c..9b7df496aee 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99-PATCHES/ChangeLog
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99-PATCHES/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-17 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+
+ * patch-30-W32TeX: No need to #undefine max/min, instead
+ compile with -DNOMINMAX.
+
2013-09-11 Peter Breitenlohner <peb@mppmu.mpg.de>
* patch-10-SELFAUTO (new): Prepare for SELFAUTOGRANDPARENT.
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
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otftotfm/otftotfm.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otftotfm/otftotfm.cc
index ce3290dd3d8..b1d7132e935 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otftotfm/otftotfm.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otftotfm/otftotfm.cc
@@ -65,7 +65,6 @@
#endif
#ifdef _MSC_VER
# include <io.h>
-#undef max
#endif
using namespace Efont;
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otftotfm/secondary.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otftotfm/secondary.cc
index 3483f6704f8..a951bc7d304 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otftotfm/secondary.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otftotfm/secondary.cc
@@ -31,10 +31,6 @@
#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