summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/luatexdir/ptexlib.h
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2013-06-28 06:55:57 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2013-06-28 06:55:57 +0000
commit35015d34d4d47cc9f080696604b421a88734ab46 (patch)
tree397083493bc785492251136950a4996e88a1cf8d /Build/source/texk/web2c/luatexdir/ptexlib.h
parentd255e898b99b63f264f3a3848a0cfe80473b4c84 (diff)
LuaTeX: more inclusion of ptexlib.h first, and guard against it
git-svn-id: svn://tug.org/texlive/trunk@30998 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/luatexdir/ptexlib.h')
-rw-r--r--Build/source/texk/web2c/luatexdir/ptexlib.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/Build/source/texk/web2c/luatexdir/ptexlib.h b/Build/source/texk/web2c/luatexdir/ptexlib.h
index d983011771f..f313e6c03e1 100644
--- a/Build/source/texk/web2c/luatexdir/ptexlib.h
+++ b/Build/source/texk/web2c/luatexdir/ptexlib.h
@@ -23,7 +23,10 @@
#ifndef PTEXLIB_H
# define PTEXLIB_H
-#if defined (_OFF_T_DEFINED) || defined (EOF) || defined (assert) || defined (_FEATURES_H)
+/* Try to detect if a system header has already been included. */
+#if (defined(__linux__) && defined(_FEATURES_H)) || \
+ (defined(_MSC_VER) && (defined(_INC_CRTDEFS) || defined(_OFF_T_DEFINED))) || \
+ (defined(__MINGW32__) && defined(__MINGW_H))
ptexlib.h must be included first!!!
#endif
@@ -32,7 +35,6 @@ ptexlib.h must be included first!!!
#endif
/* WEB2C macros and prototypes */
-# define EXTERN extern
# include "luatex.h"
# include "lib/lib.h"