summaryrefslogtreecommitdiff
path: root/Build/source
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2011-10-06 08:05:19 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2011-10-06 08:05:19 +0000
commit81af1f59bd07f19cc4d327d5f28c300c37501d6a (patch)
treeeca071f0d61cb888bc3f3eb89b58d86bcd96b1ce /Build/source
parentd89071a2812d02564ef799b63b6a8421d3626b85 (diff)
remove more TL vs W32TeX diffs
git-svn-id: svn://tug.org/texlive/trunk@24216 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rw-r--r--Build/source/texk/web2c/lib/ChangeLog5
-rw-r--r--Build/source/texk/web2c/lib/texmfmp.c31
2 files changed, 31 insertions, 5 deletions
diff --git a/Build/source/texk/web2c/lib/ChangeLog b/Build/source/texk/web2c/lib/ChangeLog
index fd5dd920c63..261b8de730d 100644
--- a/Build/source/texk/web2c/lib/ChangeLog
+++ b/Build/source/texk/web2c/lib/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-04 Peter Breitenlohner <peb@mp.mpg.de>
+
+ * texmfmp.c: More changes to reduce diffs with W32TeX,
+ for compilation with MS Visual Studio 2005.
+
2011-10-05 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
* texmfmp.c : remove unused free_shellcmdlist()
diff --git a/Build/source/texk/web2c/lib/texmfmp.c b/Build/source/texk/web2c/lib/texmfmp.c
index 8afdc4053df..24e7fd8480b 100644
--- a/Build/source/texk/web2c/lib/texmfmp.c
+++ b/Build/source/texk/web2c/lib/texmfmp.c
@@ -12,6 +12,7 @@
#defines TeX or MF, which avoids the need for a special
Makefile rule. */
+#include <kpathsea/config.h>
#include <kpathsea/c-ctype.h>
#include <kpathsea/line.h>
#include <kpathsea/readable.h>
@@ -21,12 +22,12 @@
#include <kpathsea/concatn.h>
#endif
-#include <time.h> /* For `struct tm'. */
#if defined (HAVE_SYS_TIME_H)
#include <sys/time.h>
#elif defined (HAVE_SYS_TIMEB_H)
#include <sys/timeb.h>
#endif
+#include <time.h> /* For `struct tm'. Moved here for Visual Studio 2005. */
#if defined(__STDC__)
#include <locale.h>
@@ -39,23 +40,37 @@
/* {tex,mf}d.h defines TeX, MF, INI, and other such symbols.
Unfortunately there's no way to get the banner into this code, so
just repeat the text. */
+/* We also define predicates, e.g., IS_eTeX for all e-TeX like engines, so
+ the rest of this file can remain unchanged when adding a new engine. */
#ifdef TeX
#if defined(XeTeX)
+#define IS_eTeX 1
#include <xetexdir/xetexextra.h>
#elif defined (eTeX)
+#define IS_eTeX 1
#include <etexdir/etexextra.h>
#elif defined (pdfTeX)
+#define IS_eTeX 1
#include <pdftexdir/pdftexextra.h>
#include <pdftexdir/ptexlib.h>
#elif defined (Aleph)
+#define IS_eTeX 1
#include <alephdir/alephextra.h>
#elif defined (pTeX)
+#define IS_pTeX 1
#include <ptexdir/ptexextra.h>
#elif defined (epTeX)
+#define IS_eTeX 1
+#define IS_pTeX 1
#include <eptexdir/eptexextra.h>
#elif defined (upTeX)
+#define IS_pTeX 1
+#define IS_upTeX 1
#include <uptexdir/uptexextra.h>
#elif defined (eupTeX)
+#define IS_eTeX 1
+#define IS_pTeX 1
+#define IS_upTeX 1
#include <euptexdir/euptexextra.h>
#else
#define BANNER "This is TeX, Version 3.1415926"
@@ -93,9 +108,15 @@
#define edit_var "MFEDIT"
#endif /* MF */
-#define IS_eTeX (defined(eTeX) || defined(epTeX) || defined(eupTeX) || defined(pdfTeX) || defined(Aleph) || defined(XeTeX))
-#define IS_pTeX (defined(pTeX) || defined(epTeX) || defined(upTeX) || defined(eupTeX))
-#define IS_upTeX (defined(upTeX) || defined(eupTeX))
+#if !defined(IS_eTeX)
+# define IS_eTeX 0
+#endif
+#if !defined(IS_pTeX)
+# define IS_pTeX 0
+#endif
+#if !defined(IS_upTeX)
+# define IS_upTeX 0
+#endif
#if defined(__SyncTeX__)
/*
@@ -1485,7 +1506,7 @@ static struct option long_options[]
#endif
{ "kanji", 1, 0, 0 },
{ "kanji-internal", 1, 0, 0 },
-#endif
+#endif /* IS_pTeX */
{ 0, 0, 0, 0 } };
static void