summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2012-09-18 17:47:26 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2012-09-18 17:47:26 +0000
commita47b1f51fb0bd69c3fb6f6d5d5b8c8192bc03fb9 (patch)
tree214cfbb3a24d7d90659a80e8e254244965124ae0 /Build/source/texk/web2c
parentb8187616d11e66d6df2f1711357d47cbca9be20f (diff)
luaTeX: Avoid conflicting extern declaration of environ,
declared in <stdlib.h> for WIN32 (from W32TeX) git-svn-id: svn://tug.org/texlive/trunk@27712 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c')
-rw-r--r--Build/source/texk/web2c/luatexdir/ChangeLog5
-rw-r--r--Build/source/texk/web2c/luatexdir/lua/luatex-api.h4
2 files changed, 8 insertions, 1 deletions
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog
index a7699a2e782..c27bcd4b2a1 100644
--- a/Build/source/texk/web2c/luatexdir/ChangeLog
+++ b/Build/source/texk/web2c/luatexdir/ChangeLog
@@ -3,6 +3,11 @@
* lua/luainit.w (parse_options): allow lualatex "\input" "a b" on
Windows.
+2012-09-08 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * luatex-api.h: Avoid conflicting extern declaration of environ,
+ declared in <stdlib.h> for WIN32 (from W32TeX).
+
2012-08-21 Akira Kakuto <kakuto@fuk.kinidai.ac.jp>
* tex/texdeffont.w (tex_def_font): Recover the old code, because the
diff --git a/Build/source/texk/web2c/luatexdir/lua/luatex-api.h b/Build/source/texk/web2c/luatexdir/lua/luatex-api.h
index e25f3ca8d40..9de349a78e9 100644
--- a/Build/source/texk/web2c/luatexdir/lua/luatex-api.h
+++ b/Build/source/texk/web2c/luatexdir/lua/luatex-api.h
@@ -1,6 +1,6 @@
/* luatex-api.h
- Copyright 2006-2010 Taco Hoekwater <taco@luatex.org>
+ Copyright 2006-2012 Taco Hoekwater <taco@luatex.org>
This file is part of LuaTeX.
@@ -195,7 +195,9 @@ extern char *FindResourceTtfFont(char *filename, char *fontname); /* luafo
extern char charsetstr[]; /* from mpdir/psout.w */
+#ifndef WIN32
extern char **environ;
+#endif
extern int luac_main(int argc, char *argv[]); /* texluac.w */