From 27b522d95b4dc039de771cc95471f84de5200e6e Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Sat, 4 Aug 2012 10:39:03 +0000 Subject: WIN32: Replace P_WAIT by _P_WAIT git-svn-id: svn://tug.org/texlive/trunk@27306 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/kpathsea/win32/ChangeLog | 4 ++++ Build/source/texk/kpathsea/win32/mktexfmt.c | 2 +- Build/source/texk/kpathsea/win32/mktexpk.c | 14 +++++++------- Build/source/texk/kpathsea/win32/mktextfm.c | 2 +- Build/source/texk/web2c/otps/win32/ChangeLog | 4 ++++ Build/source/texk/web2c/otps/win32/mkocp.c | 2 +- Build/source/texk/web2c/otps/win32/mkofm.c | 2 +- 7 files changed, 19 insertions(+), 11 deletions(-) diff --git a/Build/source/texk/kpathsea/win32/ChangeLog b/Build/source/texk/kpathsea/win32/ChangeLog index 87391e2e45c..9905eb0b95a 100644 --- a/Build/source/texk/kpathsea/win32/ChangeLog +++ b/Build/source/texk/kpathsea/win32/ChangeLog @@ -1,3 +1,7 @@ +2012-08-03 Peter Breitenlohner + + * mktexfmt.c, mktexpk.c, mktextfm.c: Replace P_WAIT by _P_WAIT. + 2012-04-09 Peter Breitenlohner * Makefile.am (AM_CPPFLAGS): Define WEB2C_KPSE_VERSION. diff --git a/Build/source/texk/kpathsea/win32/mktexfmt.c b/Build/source/texk/kpathsea/win32/mktexfmt.c index 3b38aa038b7..826bedecba3 100644 --- a/Build/source/texk/kpathsea/win32/mktexfmt.c +++ b/Build/source/texk/kpathsea/win32/mktexfmt.c @@ -73,7 +73,7 @@ int main(int ac, char **av) strcpy(fullbin, texbindir); strcat(fullbin, "fmtutil.exe"); fprintf(stderr, "Running the command %s\n", fullbin); - spawnlp(P_WAIT, fullbin, "fmtutil", "--byfmt", av[1], NULL); + spawnlp(_P_WAIT, fullbin, "fmtutil", "--byfmt", av[1], NULL); /* END COMMAND */ diff --git a/Build/source/texk/kpathsea/win32/mktexpk.c b/Build/source/texk/kpathsea/win32/mktexpk.c index e4bd7c3e5e2..97035a5397d 100644 --- a/Build/source/texk/kpathsea/win32/mktexpk.c +++ b/Build/source/texk/kpathsea/win32/mktexpk.c @@ -774,7 +774,7 @@ main (int ac, char **av) fprintf (stderr, "%s %s\n", execfile, cmd); strcpy(fullbin, texbindir); strcat(fullbin, execfile); - (void) spawnlp (P_WAIT, fullbin, execfile, cmd, NULL); + (void) spawnlp (_P_WAIT, fullbin, execfile, cmd, NULL); sprintf (cmd, "%s.%sgf", name, dpi); @@ -796,7 +796,7 @@ main (int ac, char **av) fprintf (stderr, "%s %s %s\n", execfile, cmd, pkname); strcpy(fullbin, texbindir); strcat(fullbin, execfile); - (void) spawnlp (P_WAIT, fullbin, execfile, cmd, pkname, NULL); + (void) spawnlp (_P_WAIT, fullbin, execfile, cmd, pkname, NULL); if (_access (pkname, 0) != 0) { tpkerr ("Failed to make pk from gf."); @@ -1115,7 +1115,7 @@ skip flag fprintf (stderr, "%s %s\n", execfile, cmd); strcpy(fullbin, texbindir); strcat(fullbin, execfile); - (void) spawnlp (P_WAIT, fullbin, execfile, cmd, NULL); + (void) spawnlp (_P_WAIT, fullbin, execfile, cmd, NULL); if (_access (pkname, 0) != 0) { tpkerr ("ps2pk failed to make pk font."); @@ -1138,7 +1138,7 @@ skip flag fprintf (stderr, "%s %s %s\n", execfile, name, dpi); strcpy(fullbin, texbindir); strcat(fullbin, execfile); - (void) spawnlp (P_WAIT, fullbin, execfile, name, dpi, NULL); + (void) spawnlp (_P_WAIT, fullbin, execfile, name, dpi, NULL); if (_access (pkname, 0) != 0) { tpkerr ("gsftopk cannot be used."); @@ -1148,7 +1148,7 @@ skip flag fprintf (stderr, "%s -q %s %s\n", execfile, name, dpi); strcpy(fullbin, texbindir); strcat(fullbin, execfile); - (void) spawnlp (P_WAIT, fullbin, execfile, "-q", name, dpi, NULL); + (void) spawnlp (_P_WAIT, fullbin, execfile, "-q", name, dpi, NULL); if (_access (pkname, 0) != 0) { tpkerr ("ttf2pk failed."); @@ -1158,7 +1158,7 @@ skip flag fprintf (stderr, "%s -q -p %s %s\n", execfile, name, dpi); strcpy(fullbin, texbindir); strcat(fullbin, execfile); - (void) spawnlp (P_WAIT, fullbin, execfile, "-q -p", name, dpi, NULL); + (void) spawnlp (_P_WAIT, fullbin, execfile, "-q -p", name, dpi, NULL); sprintf (cmd, "%s.%sgf", name, dpi); if (_access (cmd, 0) != 0) { @@ -1172,7 +1172,7 @@ skip flag fprintf (stderr, "%s %s %s\n", execfile, cmd, pkname); strcpy(fullbin, texbindir); strcat(fullbin, execfile); - (void) spawnlp (P_WAIT, fullbin, execfile, cmd, pkname, NULL); + (void) spawnlp (_P_WAIT, fullbin, execfile, cmd, pkname, NULL); if (_access (pkname, 0) != 0) { tpkerr ("All trials failed."); diff --git a/Build/source/texk/kpathsea/win32/mktextfm.c b/Build/source/texk/kpathsea/win32/mktextfm.c index a418f4b339f..ee69d22c606 100644 --- a/Build/source/texk/kpathsea/win32/mktextfm.c +++ b/Build/source/texk/kpathsea/win32/mktextfm.c @@ -283,7 +283,7 @@ issetdest = 2 : current directory fprintf (stderr, "%s %s\n", execfile, cmd); strcpy(fullbin, texbindir); strcat(fullbin, execfile); - (void) spawnlp (P_WAIT, fullbin, execfile, cmd, NULL); + (void) spawnlp (_P_WAIT, fullbin, execfile, cmd, NULL); /* return to original stdout and stdin */ _dup2 (savo, fileno (stdout)); diff --git a/Build/source/texk/web2c/otps/win32/ChangeLog b/Build/source/texk/web2c/otps/win32/ChangeLog index 5cb6af36010..677cbdd52a2 100644 --- a/Build/source/texk/web2c/otps/win32/ChangeLog +++ b/Build/source/texk/web2c/otps/win32/ChangeLog @@ -1,3 +1,7 @@ +2012-08-03 Peter Breitenlohner + + * mkocp.c, mkofm.c: Replace P_WAIT by _P_WAIT. + 2012-07-15 Peter Breitenlohner * mkocp.c: Pass program name string to kpse_set_program_name. diff --git a/Build/source/texk/web2c/otps/win32/mkocp.c b/Build/source/texk/web2c/otps/win32/mkocp.c index 75bea56d1a8..dceb3ecab06 100644 --- a/Build/source/texk/web2c/otps/win32/mkocp.c +++ b/Build/source/texk/web2c/otps/win32/mkocp.c @@ -50,7 +50,7 @@ int main(int ac, char **av) /* COMMAND */ - spawnlp(P_WAIT, "otp2ocp", "otp2ocp", name, NULL); + spawnlp(_P_WAIT, "otp2ocp", "otp2ocp", name, NULL); /* END COMMAND */ diff --git a/Build/source/texk/web2c/otps/win32/mkofm.c b/Build/source/texk/web2c/otps/win32/mkofm.c index 71aeee9d1b2..9ddd714ecaa 100644 --- a/Build/source/texk/web2c/otps/win32/mkofm.c +++ b/Build/source/texk/web2c/otps/win32/mkofm.c @@ -5,5 +5,5 @@ int main(int argc, char *argv[]) { strcpy(argv[0], "mkofm"); - return spawnvp(P_WAIT, "mktextfm.exe", (const char* const*)argv); + return spawnvp(_P_WAIT, "mktextfm.exe", (const char* const*)argv); } -- cgit v1.2.3