From f06bc5938cd378d5ce433d938232a11e584d709c Mon Sep 17 00:00:00 2001
From: Taco Hoekwater <taco@metatex.org>
Date: Wed, 9 Jul 2008 15:53:44 +0000
Subject: [PATCH] all exported mpx stuff starts with mpx_ prefix

git-svn-id: svn+ssh://scm.foundry.supelec.fr/svn/metapost/mplib/trunk@619 b0617d17-b707-0410-b22c-fd2634e05cc4
---
 src/texk/web2c/mpdir/mpost.w  | 6 +++---
 src/texk/web2c/mpdir/mpxout.w | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/texk/web2c/mpdir/mpost.w b/src/texk/web2c/mpdir/mpost.w
index 1d859af..ce722fd 100644
--- a/src/texk/web2c/mpdir/mpost.w
+++ b/src/texk/web2c/mpdir/mpost.w
@@ -251,12 +251,12 @@ static int mpost_run_make_mpx (MP mp, char *mpname, char *mpxname) {
       mpost_xfree(qmpname);
       mpost_xfree(qmpxname);
     } else {
-      makempx_options * mpxopt;
+      mpx_options * mpxopt;
       char *s = NULL;
       char *maincmd = NULL;
       int mpxmode = mp_troff_mode(mp);
       char *mpversion = mp_metapost_version () ;
-      mpxopt = mpost_xmalloc(sizeof(makempx_options));
+      mpxopt = mpost_xmalloc(sizeof(mpx_options));
       if (mpost_tex_program != NULL && *mpost_tex_program != '\0') {
         maincmd = mpost_xstrdup(mpost_tex_program);
       } else {
@@ -288,7 +288,7 @@ static int mpost_run_make_mpx (MP mp, char *mpname, char *mpxname) {
         strcpy (mpxopt->banner, banner);
         strcat (mpxopt->banner, mpversion);
       }
-      ret = mp_makempx(mpxopt);
+      ret = mpx_makempx(mpxopt);
       mpost_xfree(mpxopt->cmd);
       mpost_xfree(mpxopt->mptexpre);
       mpost_xfree(mpxopt->banner);
diff --git a/src/texk/web2c/mpdir/mpxout.w b/src/texk/web2c/mpdir/mpxout.w
index 4b50a80..899d9be 100644
--- a/src/texk/web2c/mpdir/mpxout.w
+++ b/src/texk/web2c/mpdir/mpxout.w
@@ -4037,7 +4037,7 @@ static void mpx_command_error (MPX mpx, int cmdlength, char **cmdline) {
 
 
 @ @(mpxout.h@>=
-typedef struct makempx_options {
+typedef struct mpx_options {
   int mode;
   char *cmd;
   char *mptexpre;
@@ -4046,8 +4046,8 @@ typedef struct makempx_options {
   char *banner;
   int debug;
   mpx_file_finder find_file;
-} makempx_options;
-int mp_makempx (makempx_options *mpxopt) ;
+} mpx_options;
+int mpx_makempx (mpx_options *mpxopt) ;
 
  
 @ 
@@ -4056,7 +4056,7 @@ int mp_makempx (makempx_options *mpxopt) ;
 @d MPXLOG "makempx.log"
 
 @c
-int mp_makempx (makempx_options *mpxopt) {
+int mpx_makempx (mpx_options *mpxopt) {
     MPX mpx;
     char **cmdline, **cmdbits;
     char infile[15];
-- 
2.32.0.93.g670b81a890