[project @ 2000-11-14 16:28:38 by simonmar]

[ghc-hetmet.git] / ghc / interpreter / hugsbasictypes.h

diff --git a/ghc/interpreter/hugsbasictypes.h b/ghc/interpreter/hugsbasictypes.h
index d7c7101..497c7e4 100644 (file)
--- a/ghc/interpreter/hugsbasictypes.h
+++ b/ghc/interpreter/hugsbasictypes.h
@@ -10,8 +10,8 @@
  * included in the distribution.
  *
  * $RCSfile: hugsbasictypes.h,v $
- * $Revision: 1.1 $
- * $Date: 2000/03/23 14:54:21 $
+ * $Revision: 1.3 $
+ * $Date: 2000/04/05 14:13:58 $
  * ------------------------------------------------------------------------*/
 
 #define NON_POSIX_SOURCE
@@ -165,22 +165,6 @@ extern  int     stricmp    Args((const char *, const char*));
 #endif
 
 /*---------------------------------------------------------------------------
- * Interrupting execution (signals, allowBreak):
- *-------------------------------------------------------------------------*/
-
-#if !DOS && VOID_INT_SIGNALS
-# define sigProto(nm)   void nm ( int )
-# define sigRaise(nm)   nm(1)
-# define sigHandler(nm) void nm ( sig_arg ) int sig_arg;
-# define sigResume      return
-#else
-# define sigProto(nm)   int nm ( Void )
-# define sigRaise(nm)   nm()
-# define sigHandler(nm) int nm ( Void )
-# define sigResume      return 1
-#endif
-
-/*---------------------------------------------------------------------------
  * Assertions
  *-------------------------------------------------------------------------*/
 
@@ -259,15 +243,24 @@ extern int vsnprintf ( char*, int, const char*, va_list );
  * Tweaking this lets us redirect prompts, error messages, etc - but has no
  * effect on output of Haskell programs (which should use hPutStr and friends).
  *-------------------------------------------------------------------------*/
+              
+extern Void   hugsPrintf            (const char *, ...);
+extern Void   hugsPutchar           (int);
+extern Void   hugsFlushStdout       (Void);
+extern Void   hugsEnableOutput      (Bool);
+                            
+extern Void   hugsFFlush            (FILE*);
+extern Void   hugsFPrintf           (FILE*, const char*, ...);
+extern Void   hugsPutc              (int, FILE*);
+
+#define Printf               hugsPrintf
+#define Putchar              hugsPutchar
+#define FlushStdout          hugsFlushStdout
+#define EnableOutput         hugsEnableOutput
+#define ClearOutputBuffer    hugsClearOutputBuffer
+
+#define FFlush               hugsFFlush
+#define FPrintf              hugsFPrintf
+#define Putc                 hugsPutc
                              
-#define Printf               printf
-#define Putchar              putchar
-#define FlushStdout()        fflush(stdout)
-#define EnableOutput(f)      doNothing()
-#define ClearOutputBuffer()  0
-
-#define FFlush               fflush
-#define FPrintf              fprintf
-#define Putc                 putc
-
 /*-------------------------------------------------------------------------*/