summaryrefslogtreecommitdiff
path: root/Nt/386/include
diff options
context:
space:
mode:
authorCharles Forsyth <charles.forsyth@gmail.com>2017-04-15 15:35:40 +0100
committerCharles Forsyth <charles.forsyth@gmail.com>2017-04-15 15:35:40 +0100
commit9f87c1613c0385e8264a2e5eca8f503cc446fbf1 (patch)
tree1cf6c12718d911236d7c8dff41b81d4d97d38dfa /Nt/386/include
parent128369f1bb02022b2f5f59fca37f2025c49e2651 (diff)
MS include files now #define environ,
which messes up its use as field of struct, so undef it, unless needed for Windows interface, as controlled by INFERNO_KEEPENVIRON. Only rc and mk need extern char**environ
Diffstat (limited to 'Nt/386/include')
-rwxr-xr-xNt/386/include/lib9.h4
1 files changed, 4 insertions, 0 deletions
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