X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=include%2FHsBase.h;h=cea5290b7693eabe2ec7bcf134413208c6e9cee3;hb=689d91008f8073da68920a0168c07f14478f875d;hp=3b88d236bb813e435d3edac39fecf16477668b15;hpb=b2d9ac8135dd9128250193dd1a32a3ee75210934;p=ghc-base.git diff --git a/include/HsBase.h b/include/HsBase.h index 3b88d23..cea5290 100644 --- a/include/HsBase.h +++ b/include/HsBase.h @@ -1,20 +1,21 @@ /* ----------------------------------------------------------------------------- - * $Id: HsBase.h,v 1.5 2002/03/26 10:53:03 simonmar Exp $ + * $Id: HsBase.h,v 1.30 2003/09/25 15:14:44 panne 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" #include #include +#include #ifdef HAVE_SYS_TYPES_H #include @@ -46,6 +47,9 @@ #ifdef HAVE_UTIME_H #include #endif +#ifdef HAVE_SYS_UTSNAME_H +#include +#endif #if defined(HAVE_GETTIMEOFDAY) # ifdef HAVE_SYS_TIME_H # include @@ -68,12 +72,15 @@ #ifdef HAVE_SYS_TIMES_H #include #endif -#ifdef HAVE_WINSOCK_H +#if defined(HAVE_WINSOCK_H) && defined(__MINGW32__) #include #endif #ifdef HAVE_LIMITS_H #include #endif +#ifdef HAVE_WCTYPE_H +#include +#endif #if !defined(mingw32_TARGET_OS) && !defined(irix_TARGET_OS) # if defined(HAVE_SYS_RESOURCE_H) @@ -96,9 +103,8 @@ #endif #include "lockFile.h" #include "dirUtils.h" -#include "errUtils.h" -#ifdef _WIN32 +#if defined(__MINGW32__) #include #include #include "timeUtils.h" @@ -110,9 +116,22 @@ int *ghcErrno(void); /* in system.c */ HsInt systemCmd(HsAddr cmd); +/* in rawSystem.c */ +#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); + +/* in Signals.c */ +extern HsInt nocldstop; + /* ----------------------------------------------------------------------------- 64-bit operations, defined in longlong.c -------------------------------------------------------------------------- */ @@ -179,10 +198,6 @@ StgWord64 stg_integerToWord64 (StgInt sa, StgByteArray /* Really: mp_limb_t* */ #define INLINE extern inline #endif -INLINE int -__hscore_sigaddset( sigset_t * set, int s ) -{ return sigaddset(set,s); } - 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); } @@ -193,9 +208,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 * @@ -231,11 +262,7 @@ __hscore_seek_cur() INLINE HsInt __hscore_o_binary() { -#ifdef HAVE_O_BINARY - return O_BINARY; -#else - return 0; -#endif + return CONST_O_BINARY; } INLINE int @@ -343,7 +370,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; @@ -354,28 +381,28 @@ 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); + return send(fd,(char *)ptr + off, sz, 0); } #endif - return write(fd,ptr + off, sz); + return write(fd,(char *)ptr + off, sz); } 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); + return recv(fd,(char *)ptr + off, sz, 0); } #endif - return read(fd,ptr + off, sz); + return read(fd,(char *)ptr + off, sz); } -#ifdef mingw32_TARGET_OS +#if defined(__MINGW32__) INLINE long * __hscore_Time_ghcTimezone( void ) { return &_timezone; } @@ -386,7 +413,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); @@ -403,7 +430,15 @@ __hscore_lstat( HsAddr fname, HsAddr st ) #endif } -INLINE HsInt __hscore_path_max() { return PATH_MAX; } +#ifdef PATH_MAX +/* A size that will contain many path names, but not necessarily all + * (PATH_MAX is not defined on systems with unlimited path length, + * e.g. the Hurd). + */ +INLINE HsInt __hscore_long_path_size() { return PATH_MAX; } +#else +INLINE HsInt __hscore_long_path_size() { return 4096; } +#endif INLINE mode_t __hscore_R_OK() { return R_OK; } INLINE mode_t __hscore_W_OK() { return W_OK; } @@ -579,5 +614,48 @@ __hscore_f_setfl( void ) #endif } -#endif +// defined in rts/RtsStartup.c. +extern void* __hscore_get_saved_termios(int fd); +extern void __hscore_set_saved_termios(int fd, void* ts); + +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; } +#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__ */