summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2013-09-16 07:53:26 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2013-09-16 07:53:26 +0000
commit709a77cce65135408285595106c49cdc4f7d136c (patch)
tree3a2a2e4eb9d0f66313ce38ad92705f59d3beefe4 /Build
parent3a2b881b23875b7ee27233b1e3d9474428341712 (diff)
dvisvgm: : Build fix for Visual Studio 2010 (frem Akira)
git-svn-id: svn://tug.org/texlive/trunk@31671 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-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, 43 insertions, 0 deletions
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5-PATCHES/ChangeLog b/Build/source/texk/dvisvgm/dvisvgm-1.5-PATCHES/ChangeLog
index 15c1b5b2b7e..6a6cc1bbf14 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-16 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+
+ * patch-01-MSVC (new): Build fix for Visual Studio 2010.
+
2013-09-10 Peter Breitenlohner <peb@mppmu.mpg.de>
* Import release 1.5.
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
new file mode 100644
index 00000000000..966e17022af
--- /dev/null
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5-PATCHES/patch-01-MSVC
@@ -0,0 +1,31 @@
+ 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 d7f32808e26..85ce89f3325 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/FontMap.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5/src/FontMap.cpp
@@ -33,6 +33,10 @@
#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 bc4a9ed016c..50e5232eefa 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Message.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Message.h
@@ -29,6 +29,10 @@
#include "types.h"
+#ifdef _MSC_VER
+#undef max
+#endif
+
class Message;
class MessageStream