summaryrefslogtreecommitdiff
path: root/Build/source
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-03-08 23:51:42 +0000
committerKarl Berry <karl@freefriends.org>2008-03-08 23:51:42 +0000
commitf98065f9d080bb9f221e46cf09b6a2a54cb7e5ca (patch)
treefe323c64d9a3c30731bec5c0977b4396b298f579 /Build/source
parent0f2ded353988b19236ea87f6f135ab63045a5672 (diff)
attempt to avoid some -Wimplicit MetaPost warnings
git-svn-id: svn://tug.org/texlive/trunk@6904 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rw-r--r--Build/source/texk/web2c/lib/ChangeLog5
-rw-r--r--Build/source/texk/web2c/lib/texmfmp.c9
-rw-r--r--Build/source/texk/web2c/web2c/ChangeLog5
-rw-r--r--Build/source/texk/web2c/web2c/coerce.h5
4 files changed, 21 insertions, 3 deletions
diff --git a/Build/source/texk/web2c/lib/ChangeLog b/Build/source/texk/web2c/lib/ChangeLog
index a77d38afb01..bb0e3b96a6d 100644
--- a/Build/source/texk/web2c/lib/ChangeLog
+++ b/Build/source/texk/web2c/lib/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-09 Karl Berry <karl@tug.org>
+
+ * texmfmp.c (maketexstring) [!MP]: only define this fn if !MP,
+ since MetaPost has its own in mpdir/utils.c.
+
2008-01-29 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.in: Add @configure_input@ line.
diff --git a/Build/source/texk/web2c/lib/texmfmp.c b/Build/source/texk/web2c/lib/texmfmp.c
index c9b256d1910..cefab57cbd3 100644
--- a/Build/source/texk/web2c/lib/texmfmp.c
+++ b/Build/source/texk/web2c/lib/texmfmp.c
@@ -1908,6 +1908,8 @@ checkpoolpointer (poolpointer poolptr, size_t len)
}
}
+#ifndef MP /* MP has its own in mpdir/utils.c */
+
#ifndef XeTeX /* XeTeX uses this from XeTeX_mac.c */
static
#endif
@@ -1942,14 +1944,15 @@ maketexstring(const_string s)
else
strpool[poolptr++] = rval;
}
-#else
+#else /* ! XeTeX */
while (len-- > 0)
strpool[poolptr++] = *s++;
-#endif
+#endif /* ! XeTeX */
return (makestring());
}
-#endif
+#endif /* !MP */
+#endif /* !pdfTeX */
strnumber
makefullnamestring()
diff --git a/Build/source/texk/web2c/web2c/ChangeLog b/Build/source/texk/web2c/web2c/ChangeLog
index 53e4a3f6889..3a80eafcf71 100644
--- a/Build/source/texk/web2c/web2c/ChangeLog
+++ b/Build/source/texk/web2c/web2c/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-09 Karl Berry <karl@tug.org>
+
+ * coerce.h [MP]: #include <mpdir/mplib.h> to get declarations,
+ with MPOSTCOERCE defined to avoid re-including mpd.h.
+
2008-01-29 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.in: Add @configure_input@ line.
diff --git a/Build/source/texk/web2c/web2c/coerce.h b/Build/source/texk/web2c/web2c/coerce.h
index ec937881173..204fce17767 100644
--- a/Build/source/texk/web2c/web2c/coerce.h
+++ b/Build/source/texk/web2c/web2c/coerce.h
@@ -56,3 +56,8 @@ extern void remembersourceinfo P2H(strnumber, int);
#ifdef XeTeX
#include <xetexdir/xetex.h>
#endif /* XeTeX */
+
+#ifdef MP
+#define MPOSTCOERCE
+#include <mpdir/mplib.h>
+#endif /* MP */