X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FRtsUtils.h;h=96a5f0d82f9b11077f165db43fceee06891d20a3;hb=e6218fe7eff4e34e1a3c823cd4b7aebe09d2d4fb;hp=cb01e3270a4ae0300ab25cb38a353c140c4f1a0c;hpb=986472c3dffec8ee02874de3b001c0964520be4d;p=ghc-hetmet.git

diff --git a/ghc/rts/RtsUtils.h b/ghc/rts/RtsUtils.h
index cb01e32..96a5f0d 100644
--- a/ghc/rts/RtsUtils.h
+++ b/ghc/rts/RtsUtils.h
@@ -1,36 +1,54 @@
 /* -----------------------------------------------------------------------------
- * $Id: RtsUtils.h,v 1.11 2001/08/29 14:55:58 sewardj Exp $
  *
- * (c) The GHC Team, 1998-1999
+ * (c) The GHC Team, 1998-2005
  *
  * General utility functions used in the RTS.
  *
  * ---------------------------------------------------------------------------*/
 
-extern void *stgMallocBytes(int n, char *msg);
-extern void *stgMallocWords(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 *stgReallocWords(void *p, int n, char *msg);
-extern void *stgCallocBytes(int n, int m, char *msg);
 
-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 stgFree(void* p);
 
-extern void _stgAssert (char *filename, unsigned int linenum);
+/* -----------------------------------------------------------------------------
+ * Misc other utilities
+ * -------------------------------------------------------------------------- */
 
 extern void heapOverflow(void);
 
-void resetNonBlockingFd(int fd);
+extern void setNonBlockingFd(int fd);
+extern void resetNonBlockingFd(int fd);
 
 extern nat stg_strlen(char *str);
 
-/*Defined in Main.c, but made visible here*/
-extern void stg_exit(I_ n) __attribute__((noreturn));
+extern char *time_str(void);
+extern char *ullong_format_string(ullong, char *, rtsBool);
 
-char *time_str(void);
-char *ullong_format_string(ullong, char *, rtsBool);
+#ifdef PAR
+extern ullong msTime(void);
+#endif
 
-ullong   msTime(void);
+#ifdef DEBUG
+extern void heapCheckFail( void );
+#endif
 
+extern void* __hscore_get_saved_termios(int fd);
+extern void __hscore_set_saved_termios(int fd, void* ts);
 
+#endif /* RTSUTILS_H */