X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FRtsUtils.h;h=96a5f0d82f9b11077f165db43fceee06891d20a3;hb=0dbbf1932d550293986af6244202cb735b2cd966;hp=2adcf355a748cf468cf1bf5bffc502eb12c45c42;hpb=a40e9b9216cdfffc1adc2047eb809b0026d45028;p=ghc-hetmet.git

diff --git a/ghc/rts/RtsUtils.h b/ghc/rts/RtsUtils.h
index 2adcf35..96a5f0d 100644
--- a/ghc/rts/RtsUtils.h
+++ b/ghc/rts/RtsUtils.h
@@ -1,23 +1,34 @@
 /* -----------------------------------------------------------------------------
- * $Id: RtsUtils.h,v 1.18 2003/09/26 12:11:18 panne Exp $
  *
- * (c) The GHC Team, 1998-1999
+ * (c) The GHC Team, 1998-2005
  *
  * General utility functions used in the RTS.
  *
  * ---------------------------------------------------------------------------*/
 
-/* (Checked) dynamic allocation: */
-extern void *stgMallocBytes(int n, char *msg);
+#ifndef RTSUTILS_H
+#define RTSUTILS_H
+
+/* -----------------------------------------------------------------------------
+ * (Checked) dynamic allocation
+ * -------------------------------------------------------------------------- */
+
+extern void *stgMallocBytes(int n, char *msg)
+    GNUC3_ATTRIBUTE(__malloc__);
+
+extern void* stgMallocBytesRWX(int len)
+    GNUC3_ATTRIBUTE(__malloc__);
+
 extern void *stgReallocBytes(void *p, int n, char *msg);
-extern void *stgCallocBytes(int n, int m, char *msg);
-extern void stgFree(void* p);
 
-extern void barf(char *s, ...) __attribute__((__noreturn__)) ;
-extern void belch(char *s, ...);
-extern void prog_belch(char *s, ...);
+extern void *stgCallocBytes(int n, int m, char *msg)
+     GNUC3_ATTRIBUTE(__malloc__);
 
-extern void _stgAssert (char *filename, unsigned int linenum);
+extern void stgFree(void* p);
+
+/* -----------------------------------------------------------------------------
+ * Misc other utilities
+ * -------------------------------------------------------------------------- */
 
 extern void heapOverflow(void);
 
@@ -26,14 +37,11 @@ extern void resetNonBlockingFd(int fd);
 
 extern nat stg_strlen(char *str);
 
-/*Defined in Main.c, but made visible here*/
-extern void stg_exit(int n) __attribute__((noreturn));
-
-char *time_str(void);
-char *ullong_format_string(ullong, char *, rtsBool);
+extern char *time_str(void);
+extern char *ullong_format_string(ullong, char *, rtsBool);
 
 #ifdef PAR
-ullong   msTime(void);
+extern ullong msTime(void);
 #endif
 
 #ifdef DEBUG
@@ -42,3 +50,5 @@ extern void heapCheckFail( void );
 
 extern void* __hscore_get_saved_termios(int fd);
 extern void __hscore_set_saved_termios(int fd, void* ts);
+
+#endif /* RTSUTILS_H */