Merged with inferno-os/inferno-os via default.

18 files changed, 4 insertions, 0 deletions

diff --git a/Nt/386/bin/awk.exe b/Nt/386/bin/awk.exe
index 77711a2c..6cfc878e 100755
--- a/Nt/386/bin/awk.exe
+++ b/Nt/386/bin/awk.exe
diff --git a/Nt/386/bin/c2l.exe b/Nt/386/bin/c2l.exe
index c3e2e950..71baae87 100755
--- a/Nt/386/bin/c2l.exe
+++ b/Nt/386/bin/c2l.exe
diff --git a/Nt/386/bin/cat.exe b/Nt/386/bin/cat.exe
index e9eb0d6c..ebd1b62d 100755
--- a/Nt/386/bin/cat.exe
+++ b/Nt/386/bin/cat.exe
diff --git a/Nt/386/bin/cp.exe b/Nt/386/bin/cp.exe
index 1d8c6efe..849a5a63 100755
--- a/Nt/386/bin/cp.exe
+++ b/Nt/386/bin/cp.exe
diff --git a/Nt/386/bin/data2c.exe b/Nt/386/bin/data2c.exe
index 9dfd90dd..7f8c6674 100755
--- a/Nt/386/bin/data2c.exe
+++ b/Nt/386/bin/data2c.exe
diff --git a/Nt/386/bin/echo.exe b/Nt/386/bin/echo.exe
index c2fcf3d8..442b7110 100755
--- a/Nt/386/bin/echo.exe
+++ b/Nt/386/bin/echo.exe
diff --git a/Nt/386/bin/format.exe b/Nt/386/bin/format.exe
index 3b99b70f..cd921c82 100755
--- a/Nt/386/bin/format.exe
+++ b/Nt/386/bin/format.exe
diff --git a/Nt/386/bin/iyacc.exe b/Nt/386/bin/iyacc.exe
index d0d21e30..204e4643 100755
--- a/Nt/386/bin/iyacc.exe
+++ b/Nt/386/bin/iyacc.exe
diff --git a/Nt/386/bin/mk.exe b/Nt/386/bin/mk.exe
index 1674cbe8..20a11aff 100755
--- a/Nt/386/bin/mk.exe
+++ b/Nt/386/bin/mk.exe
diff --git a/Nt/386/bin/mkdir.exe b/Nt/386/bin/mkdir.exe
index 29dad0b4..ea938e56 100755
--- a/Nt/386/bin/mkdir.exe
+++ b/Nt/386/bin/mkdir.exe
diff --git a/Nt/386/bin/mkext.exe b/Nt/386/bin/mkext.exe
index e49a5376..41a03d1a 100755
--- a/Nt/386/bin/mkext.exe
+++ b/Nt/386/bin/mkext.exe
diff --git a/Nt/386/bin/mv.exe b/Nt/386/bin/mv.exe
index c664c77e..dd3a6c70 100755
--- a/Nt/386/bin/mv.exe
+++ b/Nt/386/bin/mv.exe
diff --git a/Nt/386/bin/rcsh.exe b/Nt/386/bin/rcsh.exe
index 0af9618b..947e3cb0 100755
--- a/Nt/386/bin/rcsh.exe
+++ b/Nt/386/bin/rcsh.exe
diff --git a/Nt/386/bin/rm.exe b/Nt/386/bin/rm.exe
index a7f85e7d..34f05b54 100755
--- a/Nt/386/bin/rm.exe
+++ b/Nt/386/bin/rm.exe
diff --git a/Nt/386/bin/sed.exe b/Nt/386/bin/sed.exe
index 8aa45f0e..d086fffa 100755
--- a/Nt/386/bin/sed.exe
+++ b/Nt/386/bin/sed.exe
diff --git a/Nt/386/bin/test.exe b/Nt/386/bin/test.exe
index d90a0ba1..14d92c5d 100755
--- a/Nt/386/bin/test.exe
+++ b/Nt/386/bin/test.exe
diff --git a/Nt/386/bin/tr.exe b/Nt/386/bin/tr.exe
index a079480e..eaf728aa 100755
--- a/Nt/386/bin/tr.exe
+++ b/Nt/386/bin/tr.exe
diff --git a/Nt/386/include/lib9.h b/Nt/386/include/lib9.h
index d10c51ed..fd48f043 100755
--- a/Nt/386/include/lib9.h
+++ b/Nt/386/include/lib9.h
@@ -16,7 +16,11 @@
 #define	strtod	infstrtod
 #define	strtoll	infstrtoll
 #define	strtoull	infstrtoull
+#ifndef INFERNO_KEEPENVIRON
+/* environ is perfectly legal as the name of a local, field name or struct, but windows redefines it */
+/* the extern char** environ is only needed by two programs, so #undef it for everything else */
 #undef environ
+#endif
 
 /* do-it-yourself isinf and isnan */
 #ifndef isnan