summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvisvgm
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/dvisvgm
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/dvisvgm')
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5-PATCHES/ChangeLog4
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5-PATCHES/patch-01-MSVC31
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5/src/FontMap.cpp4
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5/src/Message.h4
4 files changed, 4 insertions, 39 deletions
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5-PATCHES/ChangeLog b/Build/source/texk/dvisvgm/dvisvgm-1.5-PATCHES/ChangeLog
index 6a6cc1bbf14..1c991bdde84 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5-PATCHES/ChangeLog
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5-PATCHES/ChangeLog
@@ -1,3 +1,7 @@
+2013-09-17 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+
+ * patch-01-MSVC (removed): Instead compile with -DNOMINMAX.
+
2013-09-16 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
* patch-01-MSVC (new): Build fix for Visual Studio 2010.
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5-PATCHES/patch-01-MSVC b/Build/source/texk/dvisvgm/dvisvgm-1.5-PATCHES/patch-01-MSVC
deleted file mode 100644
index 966e17022af..00000000000
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5-PATCHES/patch-01-MSVC
+++ /dev/null
@@ -1,31 +0,0 @@
- Visual Studio 2010 defines min and max somewhere and it fails
- to compile numeric_limits<int>::max() etc. (from Akira).
-
-diff -ur dvisvgm-1.5.orig/src/FontMap.cpp dvisvgm-1.5/src/FontMap.cpp
---- dvisvgm-1.5.orig/src/FontMap.cpp 2013-09-01 15:08:01.000000000 +0200
-+++ dvisvgm-1.5/src/FontMap.cpp 2013-09-16 09:42:49.000000000 +0200
-@@ -33,6 +33,10 @@
- #include "Message.h"
- #include "Subfont.h"
-
-+#ifdef _MSC_VER
-+#undef max
-+#endif
-+
- using namespace std;
-
-
-diff -ur dvisvgm-1.5.orig/src/Message.h dvisvgm-1.5/src/Message.h
---- dvisvgm-1.5.orig/src/Message.h 2013-08-25 20:25:32.000000000 +0200
-+++ dvisvgm-1.5/src/Message.h 2013-09-16 09:42:49.000000000 +0200
-@@ -29,6 +29,10 @@
- #include "types.h"
-
-
-+#ifdef _MSC_VER
-+#undef max
-+#endif
-+
- class Message;
-
- class MessageStream
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/FontMap.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5/src/FontMap.cpp
index 85ce89f3325..d7f32808e26 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/FontMap.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5/src/FontMap.cpp
@@ -33,10 +33,6 @@
#include "Message.h"
#include "Subfont.h"
-#ifdef _MSC_VER
-#undef max
-#endif
-
using namespace std;
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Message.h b/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Message.h
index 50e5232eefa..bc4a9ed016c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Message.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Message.h
@@ -29,10 +29,6 @@
#include "types.h"
-#ifdef _MSC_VER
-#undef max
-#endif
-
class Message;
class MessageStream