X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fincludes%2FStg.h;h=9fc9c773171e59b13bb2beda7b6b8ee5670b9f8e;hb=124690e9ad1111c4e73ba63b9d991fd014c8f645;hp=8908cf3b154c91f6c37a916a05453743c8708619;hpb=ae2fa137637637d21e3ca46b25b9325a77e77641;p=ghc-hetmet.git

diff --git a/ghc/includes/Stg.h b/ghc/includes/Stg.h
index 8908cf3..9fc9c77 100644
--- a/ghc/includes/Stg.h
+++ b/ghc/includes/Stg.h
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Stg.h,v 1.36 2001/03/01 12:25:32 rrt Exp $
+ * $Id: Stg.h,v 1.39 2001/10/27 21:44:54 sof Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -12,13 +12,6 @@
 #ifndef STG_H
 #define STG_H
 
-#ifndef NON_POSIX_SOURCE
-#define _POSIX_SOURCE   1
-#define _POSIX_C_SOURCE 199309L
-#define _ISOC9X_SOURCE
-#endif
-
-/* Let's be ISO C9X too... */
 
 /* If we include "Stg.h" directly, we're in STG code, and we therefore
  * get all the global register variables, macros etc. that go along
@@ -38,6 +31,15 @@
 /* Configuration */
 #include "config.h"
 
+#if __GNUC__ >= 3
+/* Assume that a flexible array member at the end of a struct
+ * can be defined thus: T arr[]; */
+#define FLEXIBLE_ARRAY
+#else
+/* Assume that it must be defined thus: T arr[0]; */
+#define FLEXIBLE_ARRAY 0
+#endif
+
 /* Some macros to handle DLLing (Win32 only at the moment). */
 #include "StgDLL.h"
 
@@ -219,8 +221,6 @@ typedef StgWord64       LW_;
 DLL_IMPORT_RTS extern char **prog_argv;	/* so we can get at these from Haskell */
 DLL_IMPORT_RTS extern int    prog_argc;
 
-extern char **environ;
-
 extern void stackOverflow(void);
 
 /* Creating and destroying an adjustor thunk.