summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-04-02 00:11:31 +0000
committerKarl Berry <karl@freefriends.org>2013-04-02 00:11:31 +0000
commit9303644e4d88cd1189d6d7e63a1010b535f3b650 (patch)
treea95d4494e04a8389917edb360bc5176a4c92a008 /Build
parentc25d79c21f64b8a6308def0cb49fd157013fe73c (diff)
force __cplusplus to be 1
git-svn-id: svn://tug.org/texlive/trunk@29603 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/dvisvgm/ChangeLog6
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.2-PATCHES/patch-1-cpp12
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.2/src/FileFinder.cpp5
3 files changed, 22 insertions, 1 deletions
diff --git a/Build/source/texk/dvisvgm/ChangeLog b/Build/source/texk/dvisvgm/ChangeLog
index 301f062d491..b2f2e97e1c7 100644
--- a/Build/source/texk/dvisvgm/ChangeLog
+++ b/Build/source/texk/dvisvgm/ChangeLog
@@ -1,3 +1,9 @@
+2013-04-02 Karl Berry <karl@tug.org>
+
+ * dvisvgm-1.2/src/FileFinder.cpp [__cplusplus]: force to be 1,
+ for sake of g++ 4.7.x and including c-memstr.h and Solaris.
+ Patch from Apostolos, tlbuild 1 Apr 2013 00:34:43.
+
2013-03-13 Peter Breitenlohner <peb@mppmu.mpg.de>
* configure.ac: Define TARGET_SYSTEM as "$host".
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2-PATCHES/patch-1-cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2-PATCHES/patch-1-cpp
new file mode 100644
index 00000000000..dcc061a4912
--- /dev/null
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2-PATCHES/patch-1-cpp
@@ -0,0 +1,12 @@
+--- dvisvgm-1.2/src/FileFinder.cpp (revision 29587)
++++ dvisvgm-1.2/src/FileFinder.cpp (working copy)
+@@ -18,6 +18,9 @@
+ ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
+ *************************************************************************/
+
++#undef __cplusplus
++#define __cplusplus 1
++
+ #include <cstdlib>
+ #include <fstream>
+ #include <map>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/FileFinder.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.2/src/FileFinder.cpp
index 032ea7da55f..8f167c19a50 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.2/src/FileFinder.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.2/src/FileFinder.cpp
@@ -18,6 +18,9 @@
** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
+#undef __cplusplus
+#define __cplusplus 1
+
#include <cstdlib>
#include <fstream>
#include <map>
@@ -250,4 +253,4 @@ const char* FileFinder::lookup (const std::string &fname, bool extended) {
if ((path = find_file(fname)) || (extended && ((path = find_mapped_file(fname)) || (path = mktex(fname)))))
return path;
return 0;
-} \ No newline at end of file
+}