X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=include%2FHsBase.h;h=51f2e60ee5b4be447def88274c746d0b193476e2;hb=14c3d7f368a6ec5e760b2fd57218171eeaf53a29;hp=0dbc77625e41c5b34f876675f28ccda5f2d34ce5;hpb=aacb56dd2f766175bb33c0ff86ac0f6f79d6b50c;p=ghc-base.git

diff --git a/include/HsBase.h b/include/HsBase.h
index 0dbc776..51f2e60 100644
--- a/include/HsBase.h
+++ b/include/HsBase.h
@@ -1,14 +1,14 @@
 /* -----------------------------------------------------------------------------
- * $Id: HsBase.h,v 1.12 2002/08/30 14:54:58 simonpj Exp $
+ * $Id: HsBase.h,v 1.23 2003/08/19 16:39:14 simonmar Exp $
  *
  * (c) The University of Glasgow 2001-2002
  *
- * Definitions for package `core' which are visible in Haskell land.
+ * Definitions for package `base' which are visible in Haskell land.
  *
  * ---------------------------------------------------------------------------*/
 
-#ifndef HSCORE_H
-#define HSCORE_H
+#ifndef __HSBASE_H__
+#define __HSBASE_H__
 
 #include "config.h"
 #include "HsFFI.h"
@@ -47,6 +47,9 @@
 #ifdef HAVE_UTIME_H
 #include <utime.h>
 #endif
+#ifdef HAVE_SYS_UTSNAME_H
+#include <sys/utsname.h>
+#endif
 #if defined(HAVE_GETTIMEOFDAY)
 #  ifdef HAVE_SYS_TIME_H
 #   include <sys/time.h>
@@ -75,6 +78,9 @@
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #endif
+#ifdef HAVE_WCTYPE_H
+#include <wctype.h>
+#endif
 
 #if !defined(mingw32_TARGET_OS) && !defined(irix_TARGET_OS)
 # if defined(HAVE_SYS_RESOURCE_H)
@@ -97,7 +103,6 @@
 #endif
 #include "lockFile.h"
 #include "dirUtils.h"
-#include "errUtils.h"
 
 #if defined(__MINGW32__)
 #include <io.h>
@@ -112,11 +117,18 @@ int *ghcErrno(void);
 HsInt systemCmd(HsAddr cmd);
 
 /* in rawSystem.c */
-HsInt rawSystemCmd(HsAddr cmd);
+#if defined(mingw32_TARGET_OS)
+HsInt rawSystem(HsAddr cmd);
+#else
+HsInt rawSystem(HsAddr cmd, HsAddr args);
+#endif
 
 /* in inputReady.c */
 int inputReady(int fd, int msecs, int isSock);
 
+/* in writeError.c */
+void writeErrString__(HsAddr msg_hdr, HsAddr msg, HsInt len);
+
 /* -----------------------------------------------------------------------------
    64-bit operations, defined in longlong.c
    -------------------------------------------------------------------------- */
@@ -183,12 +195,6 @@ StgWord64 stg_integerToWord64 (StgInt sa, StgByteArray /* Really: mp_limb_t* */
 #define INLINE extern inline
 #endif
 
-#if !defined(mingw32_TARGET_OS)
-INLINE int
-__hscore_sigaddset( sigset_t * set, int s )
-{ return sigaddset(set,s); }
-#endif
-
 INLINE int __hscore_s_isreg(m)  { return S_ISREG(m);  }
 INLINE int __hscore_s_isdir(m)  { return S_ISDIR(m);  }
 INLINE int __hscore_s_isfifo(m) { return S_ISFIFO(m); }
@@ -199,9 +205,25 @@ INLINE int __hscore_s_issock(m) { return S_ISSOCK(m); }
 #endif
 
 #ifndef mingw32_TARGET_OS
-INLINE void
+INLINE int
 __hscore_sigemptyset( sigset_t *set )
-{ sigemptyset(set); }
+{ return sigemptyset(set); }
+
+INLINE int
+__hscore_sigfillset( sigset_t *set )
+{ return sigfillset(set); }
+
+INLINE int
+__hscore_sigaddset( sigset_t * set, int s )
+{ return sigaddset(set,s); }
+
+INLINE int
+__hscore_sigdelset( sigset_t * set, int s )
+{ return sigdelset(set,s); }
+
+INLINE int
+__hscore_sigismember( sigset_t * set, int s )
+{ return sigismember(set,s); }
 #endif
 
 INLINE void *
@@ -362,10 +384,10 @@ __hscore_PrelHandle_write( HsInt fd, HsBool isSock, HsAddr ptr,
 {
 #if defined(__MINGW32__)
   if (isSock) {
-    return send(fd,ptr + off, sz, 0);
+    return send(fd,(char *)ptr + off, sz, 0);
   }
 #endif
-  return write(fd,ptr + off, sz);
+  return write(fd,(char *)ptr + off, sz);
 }
 
 INLINE HsInt
@@ -374,10 +396,10 @@ __hscore_PrelHandle_read( HsInt fd, HsBool isSock, HsAddr ptr,
 {
 #if defined(__MINGW32__)
   if (isSock) {
-    return recv(fd,ptr + off, sz, 0);
+    return recv(fd,(char *)ptr + off, sz, 0);
   }
 #endif
-  return read(fd,ptr + off, sz);
+  return read(fd,(char *)ptr + off, sz);
 
 }
 
@@ -587,5 +609,42 @@ __hscore_f_setfl( void )
 
 INLINE int __hscore_hs_fileno (FILE *f) { return fileno (f); }
 
-#endif
+#ifndef mingw32_TARGET_OS
+INLINE int __hsposix_SIGABRT()   { return SIGABRT; }
+INLINE int __hsposix_SIGALRM()   { return SIGALRM; }
+INLINE int __hsposix_SIGBUS()    { return SIGBUS; }
+INLINE int __hsposix_SIGCHLD()   { return SIGCHLD; }
+INLINE int __hsposix_SIGCONT()   { return SIGCONT; }
+INLINE int __hsposix_SIGFPE()    { return SIGFPE; }
+INLINE int __hsposix_SIGHUP()    { return SIGHUP; }
+INLINE int __hsposix_SIGILL()    { return SIGILL; }
+INLINE int __hsposix_SIGINT()    { return SIGINT; }
+INLINE int __hsposix_SIGKILL()   { return SIGKILL; }
+INLINE int __hsposix_SIGPIPE()   { return SIGPIPE; }
+INLINE int __hsposix_SIGQUIT()   { return SIGQUIT; }
+INLINE int __hsposix_SIGSEGV()   { return SIGSEGV; }
+INLINE int __hsposix_SIGSTOP()   { return SIGSTOP; }
+INLINE int __hsposix_SIGTERM()   { return SIGTERM; }
+INLINE int __hsposix_SIGTSTP()   { return SIGTSTP; }
+INLINE int __hsposix_SIGTTIN()   { return SIGTTIN; }
+INLINE int __hsposix_SIGTTOU()   { return SIGTTOU; }
+INLINE int __hsposix_SIGUSR1()   { return SIGUSR1; }
+INLINE int __hsposix_SIGUSR2()   { return SIGUSR2; }
+#if HAVE_SIGPOLL
+INLINE int __hsposix_SIGPOLL()   { return SIGPOLL; }
+#endif
+INLINE int __hsposix_SIGPROF()   { return SIGPROF; }
+INLINE int __hsposix_SIGSYS()    { return SIGSYS; }
+INLINE int __hsposix_SIGTRAP()   { return SIGTRAP; }
+INLINE int __hsposix_SIGURG()    { return SIGURG; }
+INLINE int __hsposix_SIGVTALRM() { return SIGVTALRM; }
+INLINE int __hsposix_SIGXCPU()   { return SIGXCPU; }
+INLINE int __hsposix_SIGXFSZ()   { return SIGXFSZ; }
+
+INLINE int __hsposix_SIG_BLOCK()   { return SIG_BLOCK; }
+INLINE int __hsposix_SIG_UNBLOCK() { return SIG_SETMASK; }
+INLINE int __hsposix_SIG_SETMASK() { return SIG_UNBLOCK; }
+#endif /* mingw32_TARGET_OS */
+
+#endif /* __HSBASE_H__ */