X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=include%2FHsBase.h;h=a127e86b30bc717bcf552ec3e5abe257bca97053;hb=d5db6c9042041e88502be3ba755db6a85822d304;hp=1a73ebb2eaae56221e4ee77ef329e9f212fa0eb0;hpb=050a91685f0005d2b8a12c961879dccbe52b84a8;p=haskell-directory.git

diff --git a/include/HsBase.h b/include/HsBase.h
index 1a73ebb..a127e86 100644
--- a/include/HsBase.h
+++ b/include/HsBase.h
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: HsBase.h,v 1.4 2002/03/19 11:24:52 simonmar Exp $
+ * $Id: HsBase.h,v 1.13 2002/09/06 14:34:15 simonmar Exp $
  *
  * (c) The University of Glasgow 2001-2002
  *
@@ -15,6 +15,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <math.h>
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
@@ -68,7 +69,7 @@
 #ifdef HAVE_SYS_TIMES_H
 #include <sys/times.h>
 #endif
-#ifdef HAVE_WINSOCK_H
+#if defined(HAVE_WINSOCK_H) && defined(__MINGW32__)
 #include <winsock.h>
 #endif
 #ifdef HAVE_LIMITS_H
@@ -98,7 +99,7 @@
 #include "dirUtils.h"
 #include "errUtils.h"
 
-#ifdef _WIN32
+#if defined(__MINGW32__)
 #include <io.h>
 #include <fcntl.h>
 #include "timeUtils.h"
@@ -110,6 +111,9 @@ int *ghcErrno(void);
 /* in system.c */
 HsInt systemCmd(HsAddr cmd);
 
+/* in rawSystem.c */
+HsInt rawSystemCmd(HsAddr cmd);
+
 /* in inputReady.c */
 int inputReady(int fd, int msecs, int isSock);
 
@@ -189,9 +193,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 *
@@ -339,7 +359,7 @@ __hscore_seek_end( void )
 INLINE HsInt
 __hscore_setmode( HsInt fd, HsBool toBin )
 {
-#ifdef _WIN32
+#if defined(__MINGW32__)
   return setmode(fd,(toBin == HS_BOOL_TRUE) ? _O_BINARY : _O_TEXT);
 #else
   return 0;
@@ -350,7 +370,7 @@ INLINE HsInt
 __hscore_PrelHandle_write( HsInt fd, HsBool isSock, HsAddr ptr, 
 			   HsInt off, int sz )
 {
-#ifdef _WIN32
+#if defined(__MINGW32__)
   if (isSock) {
     return send(fd,ptr + off, sz, 0);
   }
@@ -362,7 +382,7 @@ INLINE HsInt
 __hscore_PrelHandle_read( HsInt fd, HsBool isSock, HsAddr ptr, 
 			  HsInt off, int sz )
 {
-#ifdef _WIN32
+#if defined(__MINGW32__)
   if (isSock) {
     return recv(fd,ptr + off, sz, 0);
   }
@@ -371,7 +391,7 @@ __hscore_PrelHandle_read( HsInt fd, HsBool isSock, HsAddr ptr,
 
 }
 
-#ifdef mingw32_TARGET_OS
+#if defined(__MINGW32__)
 INLINE long *
 __hscore_Time_ghcTimezone( void ) { return &_timezone; }
 
@@ -382,7 +402,7 @@ __hscore_Time_ghcTzname( void ) { return _tzname; }
 INLINE HsInt
 __hscore_mkdir( HsAddr pathName, HsInt mode )
 {
-#if defined(mingw32_TARGET_OS)
+#if defined(__MINGW32__)
   return mkdir(pathName);
 #else
   return mkdir(pathName,mode);
@@ -575,5 +595,42 @@ __hscore_f_setfl( void )
 #endif
 }
 
+INLINE int __hscore_hs_fileno (FILE *f) { return fileno (f); }
+
+#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; }
+INLINE int __hsposix_SIGPOLL()   { return SIGPOLL; }
+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