projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2002-01-08 10:36:24 by sewardj]
[ghc-hetmet.git]
/
ghc
/
includes
/
Stg.h
diff --git
a/ghc/includes/Stg.h
b/ghc/includes/Stg.h
index
8908cf3
..
4597a5a
100644
(file)
--- 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.44 2001/12/06 10:00:01 sewardj Exp $
*
* (c) The GHC Team, 1998-1999
*
*
* (c) The GHC Team, 1998-1999
*
@@
-12,13
+12,6
@@
#ifndef STG_H
#define STG_H
#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
/* 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"
/* 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"
/* Some macros to handle DLLing (Win32 only at the moment). */
#include "StgDLL.h"
@@
-101,6
+103,14
@@
void _stgAssert (char *, unsigned int);
_stgAssert(__FILE__, __LINE__)
#endif /* DEBUG */
_stgAssert(__FILE__, __LINE__)
#endif /* DEBUG */
+/*
+ * Use this on the RHS of macros which expand to nothing
+ * to make sure that the macro can be used in a context which
+ * demands a non-empty statement.
+ */
+
+#define doNothing() do { } while (0)
+
/* -----------------------------------------------------------------------------
Global type definitions
-------------------------------------------------------------------------- */
/* -----------------------------------------------------------------------------
Global type definitions
-------------------------------------------------------------------------- */
@@
-148,6
+158,7
@@
typedef StgWord64 LW_;
/* Profiling information */
#include "StgProf.h"
/* Profiling information */
#include "StgProf.h"
+#include "StgLdvProf.h"
/* Storage format definitions */
#include "Closures.h"
/* Storage format definitions */
#include "Closures.h"
@@
-219,8
+230,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;
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.
extern void stackOverflow(void);
/* Creating and destroying an adjustor thunk.