summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2014-01-31 08:35:53 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2014-01-31 08:35:53 +0000
commit413cdef969440005d01da2c407b2c700db4592ff (patch)
tree03b8eaf198f8518b4ee22c155edfe3057f16ef53 /Build
parent48159d0e8257491a7e7655796ad2259a3296b281 (diff)
MetaPost: Replace explicit declaration of zlibVersion() by #include <zlib.h>, etc
git-svn-id: svn://tug.org/texlive/trunk@32829 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/web2c/mplibdir/ChangeLog5
-rw-r--r--Build/source/texk/web2c/mplibdir/mp.w12
2 files changed, 13 insertions, 4 deletions
diff --git a/Build/source/texk/web2c/mplibdir/ChangeLog b/Build/source/texk/web2c/mplibdir/ChangeLog
index 9d26c780e61..4bfc0a88451 100644
--- a/Build/source/texk/web2c/mplibdir/ChangeLog
+++ b/Build/source/texk/web2c/mplibdir/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-31 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * mp.w: Do not declare zlibVersion, #include <zlib.h>, etc.
+ Display header (compiled with) and library (using) versions.
+
2014-01-30 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
* mp.w, mpost.w, pngout.w: Import from MetaPost trunk.
diff --git a/Build/source/texk/web2c/mplibdir/mp.w b/Build/source/texk/web2c/mplibdir/mp.w
index b41734d5fa7..70961d0ce36 100644
--- a/Build/source/texk/web2c/mplibdir/mp.w
+++ b/Build/source/texk/web2c/mplibdir/mp.w
@@ -152,6 +152,10 @@ typedef struct MP_instance {
# include <unistd.h> /* for access */
#endif
#include <time.h> /* for struct tm \& co */
+#include <zlib.h> /* for ZLIB_VERSION, zlibVersion() */
+#include <png.h> /* for PNG_LIBPNG_VER_STRING, png_libpng_ver */
+#include <pixman.h> /* for PIXMAN_VERSION_STRING, pixman_version_string() */
+#include <cairo.h> /* for CAIRO_VERSION_STRING, cairo_version_string() */
#include "mplib.h"
#include "mplibps.h" /* external header */
#include "mplibsvg.h" /* external header */
@@ -163,8 +167,6 @@ typedef struct MP_instance {
#include "mpmath.h" /* internal header */
#include "mpmathdouble.h" /* internal header */
#include "mpstrings.h" /* internal header */
-extern char *pixman_version_string(void);
-extern const char *zlibVersion(void);
extern font_number mp_read_font_info (MP mp, char *fname); /* tfmin.w */
@h @<Declarations@>;
@<Basic printing procedures@>;
@@ -29744,8 +29746,10 @@ char *mp_metapost_version (void) {
return mp_strdup (metapost_version);
}
void mp_show_library_versions (void) {
- fprintf(stdout, "Compiled with cairo %s, pixman %s\n", cairo_version_string(), pixman_version_string());
- fprintf(stdout, "Compiled with libpng %s, zlib %s\n\n", PNG_LIBPNG_VER_STRING, zlibVersion());
+ fprintf(stdout, "Compiled with cairo %s; using %s\n", CAIRO_VERSION_STRING, cairo_version_string());
+ fprintf(stdout, "Compiled with pixman %s; using %s\n", PIXMAN_VERSION_STRING, pixman_version_string());
+ fprintf(stdout, "Compiled with libpng %s; using %s\n", PNG_LIBPNG_VER_STRING, png_libpng_ver);
+ fprintf(stdout, "Compiled with zlib %s; using %s\n\n", ZLIB_VERSION, zlibVersion());
}
@ @<Exported function headers@>=