From 709a77cce65135408285595106c49cdc4f7d136c Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Mon, 16 Sep 2013 07:53:26 +0000 Subject: dvisvgm: : Build fix for Visual Studio 2010 (frem Akira) git-svn-id: svn://tug.org/texlive/trunk@31671 c570f23f-e606-0410-a88d-b1316a301751 --- .../texk/dvisvgm/dvisvgm-1.5-PATCHES/ChangeLog | 4 +++ .../texk/dvisvgm/dvisvgm-1.5-PATCHES/patch-01-MSVC | 31 ++++++++++++++++++++++ .../texk/dvisvgm/dvisvgm-1.5/src/FontMap.cpp | 4 +++ .../source/texk/dvisvgm/dvisvgm-1.5/src/Message.h | 4 +++ 4 files changed, 43 insertions(+) create mode 100644 Build/source/texk/dvisvgm/dvisvgm-1.5-PATCHES/patch-01-MSVC (limited to 'Build') 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 + + * patch-01-MSVC (new): Build fix for Visual Studio 2010. + 2013-09-10 Peter Breitenlohner * 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::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 -- cgit v1.2.3