diff options
19 files changed, 48 insertions, 2 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index 5d88aec32d9..ea85f5761c6 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -2,6 +2,12 @@ * w2c/config.h: Define LONGINTEGER_{TYPE,PRId} for MSVC. +2012-06-30 Peter Breitenlohner <peb@mppmu.mpg.de> + + * texmfmp.h [WIN32]: Ignore DLLPROC for __MINGW32__. + + * texextra.c [W32TeX]: #define DLLPROC for tex.dll. + 2012-05-22 Peter Breitenlohner <peb@mppmu.mpg.de> * dvicopy.test, dvitype.test: Cope with spaces in paths returned diff --git a/Build/source/texk/web2c/alephdir/ChangeLog b/Build/source/texk/web2c/alephdir/ChangeLog index 18747d7f823..fb40d4dcba1 100644 --- a/Build/source/texk/web2c/alephdir/ChangeLog +++ b/Build/source/texk/web2c/alephdir/ChangeLog @@ -1,3 +1,7 @@ +2012-06-30 Peter Breitenlohner <peb@mppmu.mpg.de> + + * alephextra.c [W32TeX]: #define DLLPROC for aleph.dll. + 2012-06-28 Akira Kakuto <kakuto@fuk.kindai.ac.jp> * om16bit.ch: Aleph uses 256 math font families. diff --git a/Build/source/texk/web2c/alephdir/alephextra.c b/Build/source/texk/web2c/alephdir/alephextra.c index 8b57266c05f..3dc5729eed2 100644 --- a/Build/source/texk/web2c/alephdir/alephextra.c +++ b/Build/source/texk/web2c/alephdir/alephextra.c @@ -8,4 +8,5 @@ #include <alephd.h> /* Hand-coded routines for TeX or Metafont in C. */ +#define DLLPROC dllalephmain #include <lib/texmfmp.c> diff --git a/Build/source/texk/web2c/eptexdir/ChangeLog b/Build/source/texk/web2c/eptexdir/ChangeLog index a0744583582..57f5e82cda0 100644 --- a/Build/source/texk/web2c/eptexdir/ChangeLog +++ b/Build/source/texk/web2c/eptexdir/ChangeLog @@ -1,3 +1,7 @@ +2012-06-30 Peter Breitenlohner <peb@mppmu.mpg.de> + + * eptexextra.c [W32TeX]: #define DLLPROC for eptex.dll. + 2012-05-12 Peter Breitenlohner <peb@mppmu.mpg.de> * eptrip/eptrip.diffs, eptrip/etrip.log: Updated. diff --git a/Build/source/texk/web2c/eptexdir/eptexextra.c b/Build/source/texk/web2c/eptexdir/eptexextra.c index a07767243eb..1613372df7a 100644 --- a/Build/source/texk/web2c/eptexdir/eptexextra.c +++ b/Build/source/texk/web2c/eptexdir/eptexextra.c @@ -8,4 +8,5 @@ #include <eptexd.h> /* Hand-coded routines for TeX or Metafont in C. */ +#define DLLPROC dlleptexmain #include <lib/texmfmp.c> diff --git a/Build/source/texk/web2c/etexdir/ChangeLog b/Build/source/texk/web2c/etexdir/ChangeLog index d7f5267f019..7023fd071d3 100644 --- a/Build/source/texk/web2c/etexdir/ChangeLog +++ b/Build/source/texk/web2c/etexdir/ChangeLog @@ -1,3 +1,7 @@ +2012-06-30 Peter Breitenlohner <peb@mppmu.mpg.de> + + * etexextra.c [W32TeX]: #define DLLPROC for etex.dll. + 2012-05-11 Peter Breitenlohner <peb@mppmu.mpg.de> * etex.ch: Version 2.4, dated May 11, 2012. diff --git a/Build/source/texk/web2c/etexdir/etexextra.c b/Build/source/texk/web2c/etexdir/etexextra.c index 573f9da6a1a..441be36b0bd 100644 --- a/Build/source/texk/web2c/etexdir/etexextra.c +++ b/Build/source/texk/web2c/etexdir/etexextra.c @@ -8,4 +8,5 @@ #include <etexd.h> /* Hand-coded routines for TeX or Metafont in C. */ +#define DLLPROC dlletexmain #include <lib/texmfmp.c> diff --git a/Build/source/texk/web2c/euptexdir/ChangeLog b/Build/source/texk/web2c/euptexdir/ChangeLog index 5830868f40c..2bc38155086 100644 --- a/Build/source/texk/web2c/euptexdir/ChangeLog +++ b/Build/source/texk/web2c/euptexdir/ChangeLog @@ -1,3 +1,7 @@ +2012-06-30 Peter Breitenlohner <peb@mppmu.mpg.de> + + * euptexextra.c [W32TeX]: #define DLLPROC for euptex.dll. + 2012-05-12 Peter Breitenlohner <peb@mppmu.mpg.de> * euptrip/euptrip.diffs: Updated. diff --git a/Build/source/texk/web2c/euptexdir/euptexextra.c b/Build/source/texk/web2c/euptexdir/euptexextra.c index f710b584d5c..befb6c53ab6 100644 --- a/Build/source/texk/web2c/euptexdir/euptexextra.c +++ b/Build/source/texk/web2c/euptexdir/euptexextra.c @@ -8,4 +8,5 @@ #include <euptexd.h> /* Hand-coded routines for TeX or Metafont in C. */ +#define DLLPROC dlleuptexmain #include <lib/texmfmp.c> diff --git a/Build/source/texk/web2c/lib/ChangeLog b/Build/source/texk/web2c/lib/ChangeLog index 5efd1e860b6..4d31e76d2c6 100644 --- a/Build/source/texk/web2c/lib/ChangeLog +++ b/Build/source/texk/web2c/lib/ChangeLog @@ -1,4 +1,8 @@ 2012-06-30 Peter Breitenlohner <peb@mppmu.mpg.de> + + * texmfmp.c [WIN32]: Ignore DLLPROC for __MINGW32__. + +2012-06-30 Peter Breitenlohner <peb@mppmu.mpg.de> 2012-06-27 Norbert Preining <preining@logic.at> * texmfmp.c (runpopen): Append "b" on Windows. diff --git a/Build/source/texk/web2c/lib/texmfmp.c b/Build/source/texk/web2c/lib/texmfmp.c index 7a64962f449..b586444d4c0 100644 --- a/Build/source/texk/web2c/lib/texmfmp.c +++ b/Build/source/texk/web2c/lib/texmfmp.c @@ -838,7 +838,7 @@ maininit (int ac, string *av) happen in `topenin', then call the main body. */ int -#if defined(WIN32) && defined(DLLPROC) +#if defined(WIN32) && !defined(__MINGW32__) && defined(DLLPROC) DLLPROC (int ac, string *av) #else main (int ac, string *av) diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog index b95008e9d39..94dd827f892 100644 --- a/Build/source/texk/web2c/pdftexdir/ChangeLog +++ b/Build/source/texk/web2c/pdftexdir/ChangeLog @@ -1,3 +1,7 @@ +2012-06-30 Peter Breitenlohner <peb@mppmu.mpg.de> + + * pdftexextra.c [W32TeX]: #define DLLPROC for pdftex.dll. + 2012-06-29 Peter Breitenlohner <peb@mppmu.mpg.de> * utils.c [__MINGW32__]: #include <regex.h> as for Unix instead diff --git a/Build/source/texk/web2c/pdftexdir/pdftexextra.c b/Build/source/texk/web2c/pdftexdir/pdftexextra.c index 3bad442a03d..f302208c889 100644 --- a/Build/source/texk/web2c/pdftexdir/pdftexextra.c +++ b/Build/source/texk/web2c/pdftexdir/pdftexextra.c @@ -8,4 +8,5 @@ #include <pdftexd.h> /* Hand-coded routines for TeX or Metafont in C. */ +#define DLLPROC dllpdftexmain #include <lib/texmfmp.c> diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog index c025b9843a7..f7b9cd9f187 100644 --- a/Build/source/texk/web2c/ptexdir/ChangeLog +++ b/Build/source/texk/web2c/ptexdir/ChangeLog @@ -1,3 +1,7 @@ +2012-06-30 Peter Breitenlohner <peb@mppmu.mpg.de> + + * ptexextra.c [W32TeX]: #define DLLPROC for ptex.dll. + 2012-05-22 Peter Breitenlohner <peb@mppmu.mpg.de> * pdvitype.test, sample.test: Cope with spaces in paths returned diff --git a/Build/source/texk/web2c/ptexdir/ptexextra.c b/Build/source/texk/web2c/ptexdir/ptexextra.c index cf90e8f22d9..712cb863729 100644 --- a/Build/source/texk/web2c/ptexdir/ptexextra.c +++ b/Build/source/texk/web2c/ptexdir/ptexextra.c @@ -8,4 +8,5 @@ #include <ptexd.h> /* Hand-coded routines for TeX or Metafont in C. */ +#define DLLPROC dllptexmain #include <lib/texmfmp.c> diff --git a/Build/source/texk/web2c/texextra.c b/Build/source/texk/web2c/texextra.c index e93baa1f3b9..84032862e8e 100644 --- a/Build/source/texk/web2c/texextra.c +++ b/Build/source/texk/web2c/texextra.c @@ -8,4 +8,5 @@ #include <texd.h> /* Hand-coded routines for TeX or Metafont in C. */ +#define DLLPROC dlltexmain #include <lib/texmfmp.c> diff --git a/Build/source/texk/web2c/texmfmp.h b/Build/source/texk/web2c/texmfmp.h index 2f8cad65cc1..98e5ca1668b 100644 --- a/Build/source/texk/web2c/texmfmp.h +++ b/Build/source/texk/web2c/texmfmp.h @@ -123,7 +123,7 @@ extern int runsystem (const char *cmd); /* The entry point. */ extern void maininit (int ac, string *av); -#if defined(WIN32) && defined(DLLPROC) +#if defined(WIN32) && !defined(__MINGW32__) && defined(DLLPROC) extern __declspec(dllexport) int DLLPROC (int ac, string *av); #endif diff --git a/Build/source/texk/web2c/uptexdir/ChangeLog b/Build/source/texk/web2c/uptexdir/ChangeLog index f6d734438d3..e04fc69c09f 100644 --- a/Build/source/texk/web2c/uptexdir/ChangeLog +++ b/Build/source/texk/web2c/uptexdir/ChangeLog @@ -1,3 +1,7 @@ +2012-06-30 Peter Breitenlohner <peb@mppmu.mpg.de> + + * uptexextra.c [W32TeX]: #define DLLPROC for uptex.dll. + 2012-05-22 Peter Breitenlohner <peb@mppmu.mpg.de> * updvitype.test: Cope with spaces in paths returned by diff --git a/Build/source/texk/web2c/uptexdir/uptexextra.c b/Build/source/texk/web2c/uptexdir/uptexextra.c index 055f1ae613a..bd66abc7bdd 100644 --- a/Build/source/texk/web2c/uptexdir/uptexextra.c +++ b/Build/source/texk/web2c/uptexdir/uptexextra.c @@ -8,4 +8,5 @@ #include <uptexd.h> /* Hand-coded routines for TeX or Metafont in C. */ +#define DLLPROC dlluptexmain #include <lib/texmfmp.c> |