From b287d7f6a13823ea17e0bd415981d3a5953ca703 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Mon, 22 Feb 2010 12:09:38 +0000 Subject: build system: various small fixes for mingw32 cross compilation still incomplete git-svn-id: svn://tug.org/texlive/trunk@17141 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/lib/ChangeLog | 10 +++++ Build/source/texk/web2c/lib/Makefile.in | 2 + Build/source/texk/web2c/lib/texmfmp.c | 78 +++------------------------------ 3 files changed, 17 insertions(+), 73 deletions(-) (limited to 'Build/source/texk/web2c/lib') diff --git a/Build/source/texk/web2c/lib/ChangeLog b/Build/source/texk/web2c/lib/ChangeLog index ce94b027977..318a2b8f16b 100644 --- a/Build/source/texk/web2c/lib/ChangeLog +++ b/Build/source/texk/web2c/lib/ChangeLog @@ -1,3 +1,13 @@ +2010-02-21 Peter Breitenlohner + + * texmfmp.c: #include instead of externs. + +2010-02-20 Peter Breitenlohner + + * texmfmp.c (calledit): Use win32_system() with two args only + for MinGW32, native WIN32 uses only one arg. + (catch_interrupt) [WIN32]: Declare as static. + 2010-02-01 Karl Berry * openclose.c (open_input): do not try prepending TEXMFOUTPUT for diff --git a/Build/source/texk/web2c/lib/Makefile.in b/Build/source/texk/web2c/lib/Makefile.in index 4f473047db6..f2ed27b07d1 100644 --- a/Build/source/texk/web2c/lib/Makefile.in +++ b/Build/source/texk/web2c/lib/Makefile.in @@ -104,6 +104,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AR = @AR@ +AS = @AS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -123,6 +124,7 @@ CXXLD = @CXXLD@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ diff --git a/Build/source/texk/web2c/lib/texmfmp.c b/Build/source/texk/web2c/lib/texmfmp.c index 5b2468ead76..8cd5d18834f 100644 --- a/Build/source/texk/web2c/lib/texmfmp.c +++ b/Build/source/texk/web2c/lib/texmfmp.c @@ -1791,7 +1791,7 @@ close_file_or_pipe (FILE *f) variable `interrupt'; then they will do everything needed. */ #ifdef WIN32 /* Win32 doesn't set SIGINT ... */ -BOOL WINAPI +static BOOL WINAPI catch_interrupt (DWORD arg) { switch (arg) { @@ -2048,7 +2048,7 @@ calledit (packedASCIIcode *filename, *temp = 0; /* Execute the command. */ -#ifdef WIN32 +#ifdef __MINGW32__ /* Win32 reimplementation of the system() command provides opportunity to call it asynchronously */ if (win32_system(command, true) != 0 ) @@ -2645,77 +2645,9 @@ zmakescaled (integer p, integer q) /* Approximate 2^16*p/q */ #undef X11WIN #endif -#ifdef AMIGAWIN -extern int mf_amiga_initscreen (void); -extern void mf_amiga_updatescreen (void); -extern void mf_amiga_blankrectangle (screencol, screencol, screenrow, screenrow); -extern void mf_amiga_paintrow (screenrow, pixelcolor, transspec, screencol); -#endif -#ifdef EPSFWIN -extern int mf_epsf_initscreen (void); -extern void mf_epsf_updatescreen (void); -extern void mf_epsf_blankrectangle (screencol, screencol, screenrow, screenrow); -extern void mf_epsf_paintrow (screenrow, pixelcolor, transspec, screencol); -#endif -#ifdef HP2627WIN -extern int mf_hp2627_initscreen (void); -extern void mf_hp2627_updatescreen (void); -extern void mf_hp2627_blankrectangle (screencol, screencol, screenrow, screenrow); -extern void mf_hp2627_paintrow (screenrow, pixelcolor, transspec, screencol); -#endif -#ifdef MFTALKWIN -extern int mf_mftalk_initscreen (void); -extern void mf_mftalk_updatescreen (void); -extern void mf_mftalk_blankrectangle (screencol, screencol, screenrow, screenrow); -extern void mf_mftalk_paintrow (screenrow, pixelcolor, transspec, screencol); -#endif -#ifdef NEXTWIN -extern int mf_next_initscreen (void); -extern void mf_next_updatescreen (void); -extern void mf_next_blankrectangle (screencol, screencol, screenrow, screenrow); -extern void mf_next_paintrow (screenrow, pixelcolor, transspec, screencol); -#endif -#ifdef REGISWIN -extern int mf_regis_initscreen (void); -extern void mf_regis_updatescreen (void); -extern void mf_regis_blankrectangle (screencol, screencol, screenrow, screenrow); -extern void mf_regis_paintrow (screenrow, pixelcolor, transspec, screencol); -#endif -#ifdef SUNWIN -extern int mf_sun_initscreen (void); -extern void mf_sun_updatescreen (void); -extern void mf_sun_blankrectangle (screencol, screencol, screenrow, screenrow); -extern void mf_sun_paintrow (screenrow, pixelcolor, transspec, screencol); -#endif -#ifdef TEKTRONIXWIN -extern int mf_tektronix_initscreen (void); -extern void mf_tektronix_updatescreen (void); -extern void mf_tektronix_blankrectangle (screencol, screencol, screenrow, screenrow); -extern void mf_tektronix_paintrow (screenrow, pixelcolor, transspec, screencol); -#endif -#ifdef UNITERMWIN -extern int mf_uniterm_initscreen (void); -extern void mf_uniterm_updatescreen (void); -extern void mf_uniterm_blankrectangle (screencol, screencol, screenrow, screenrow); -extern void mf_uniterm_paintrow (screenrow, pixelcolor, transspec, screencol); -#endif -#ifdef WIN32WIN -extern int mf_win32_initscreen (void); -extern void mf_win32_updatescreen (void); -extern void mf_win32_blankrectangle (screencol, screencol, screenrow, screenrow); -extern void mf_win32_paintrow (screenrow, pixelcolor, transspec, screencol); -#endif -#ifdef X11WIN -extern int mf_x11_initscreen (void); -extern void mf_x11_updatescreen (void); -extern void mf_x11_blankrectangle (screencol, screencol, screenrow, screenrow); -extern void mf_x11_paintrow (screenrow, pixelcolor, transspec, screencol); -#endif -extern int mf_trap_initscreen (void); -extern void mf_trap_updatescreen (void); -extern void mf_trap_blankrectangle (screencol, screencol, screenrow, screenrow); -extern void mf_trap_paintrow (screenrow, pixelcolor, transspec, screencol); - +/* Prototypes for Metafont display routines: mf_XXX_initscreen, + mf_XXX_updatescreen, mf_XXX_blankrectangle, and mf_XXX_paintrow. */ +#include /* This variable, `mfwsw', contains the dispatch tables for each terminal. We map the Pascal calls to the routines `init_screen', -- cgit v1.2.3