X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=include%2FHsBase.h;h=960aedd33d463637fa6f19bbdc0fb09fdd71672d;hb=b72f2fe092981ea4233e42c67a1921dee36c9e56;hp=0dbc77625e41c5b34f876675f28ccda5f2d34ce5;hpb=aacb56dd2f766175bb33c0ff86ac0f6f79d6b50c;p=ghc-base.git diff --git a/include/HsBase.h b/include/HsBase.h index 0dbc776..960aedd 100644 --- a/include/HsBase.h +++ b/include/HsBase.h @@ -1,14 +1,13 @@ /* ----------------------------------------------------------------------------- - * $Id: HsBase.h,v 1.12 2002/08/30 14:54:58 simonpj 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" @@ -17,67 +16,78 @@ #include #include -#ifdef HAVE_SYS_TYPES_H +#if HAVE_SYS_TYPES_H #include #endif -#ifdef HAVE_UNISTD_H +#if HAVE_UNISTD_H #include #endif -#ifdef HAVE_SYS_STAT_H +#if HAVE_SYS_STAT_H #include #endif -#ifdef HAVE_FCNTL_H +#if HAVE_FCNTL_H # include #endif -#ifdef HAVE_TERMIOS_H +#if HAVE_TERMIOS_H #include #endif -#ifdef HAVE_SIGNAL_H +#if HAVE_SIGNAL_H #include +/* Ultra-ugly: OpenBSD uses broken macros for sigemptyset and sigfillset (missing casts) */ +#if __OpenBSD__ +#undef sigemptyset +#undef sigfillset +#endif #endif -#ifdef HAVE_ERRNO_H +#if HAVE_ERRNO_H #include #endif -#ifdef HAVE_STRING_H +#if HAVE_STRING_H #include #endif -#ifdef HAVE_DIRENT_H +#if HAVE_DIRENT_H #include #endif -#ifdef HAVE_UTIME_H +#if HAVE_UTIME_H #include #endif -#if defined(HAVE_GETTIMEOFDAY) -# ifdef HAVE_SYS_TIME_H +#if HAVE_SYS_UTSNAME_H +#include +#endif +#if HAVE_GETTIMEOFDAY +# if HAVE_SYS_TIME_H # include # endif -#elif defined(HAVE_GETCLOCK) -# ifdef HAVE_SYS_TIMERS_H +#elif HAVE_GETCLOCK +# if HAVE_SYS_TIMERS_H # define POSIX_4D9 1 # include # endif #endif -#if defined(HAVE_TIME_H) -# include +#if HAVE_TIME_H +#include #endif -#ifdef HAVE_SYS_TIMEB_H +#if HAVE_SYS_TIMEB_H #include #endif -#ifdef HAVE_WINDOWS_H +#if HAVE_WINDOWS_H #include #endif -#ifdef HAVE_SYS_TIMES_H +#if HAVE_SYS_TIMES_H #include #endif -#if defined(HAVE_WINSOCK_H) && defined(__MINGW32__) +#if HAVE_WINSOCK_H && defined(mingw32_TARGET_OS) #include #endif -#ifdef HAVE_LIMITS_H +#if HAVE_LIMITS_H #include #endif +#if HAVE_WCTYPE_H +#include +#endif #if !defined(mingw32_TARGET_OS) && !defined(irix_TARGET_OS) -# if defined(HAVE_SYS_RESOURCE_H) +# if HAVE_SYS_RESOURCE_H # include # endif #endif @@ -89,17 +99,16 @@ #endif /* For System */ -#ifdef HAVE_SYS_WAIT_H +#if HAVE_SYS_WAIT_H #include #endif -#ifdef HAVE_VFORK_H +#if HAVE_VFORK_H #include #endif #include "lockFile.h" #include "dirUtils.h" -#include "errUtils.h" -#if defined(__MINGW32__) +#if defined(mingw32_TARGET_OS) #include #include #include "timeUtils.h" @@ -112,11 +121,21 @@ 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); + +/* in Signals.c */ +extern HsInt nocldstop; + /* ----------------------------------------------------------------------------- 64-bit operations, defined in longlong.c -------------------------------------------------------------------------- */ @@ -180,15 +199,14 @@ StgWord64 stg_integerToWord64 (StgInt sa, StgByteArray /* Really: mp_limb_t* */ -------------------------------------------------------------------------- */ #ifndef INLINE -#define INLINE extern inline -#endif - -#if !defined(mingw32_TARGET_OS) -INLINE int -__hscore_sigaddset( sigset_t * set, int s ) -{ return sigaddset(set,s); } +# if defined(_MSC_VER) +# define INLINE extern __inline +# else +# define INLINE extern inline +# endif #endif +#if !defined(_MSC_VER) 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); } @@ -197,11 +215,28 @@ INLINE int __hscore_s_ischr(m) { return S_ISCHR(m); } #ifdef S_ISSOCK INLINE int __hscore_s_issock(m) { return S_ISSOCK(m); } #endif +#endif -#ifndef mingw32_TARGET_OS -INLINE void +#if !defined(mingw32_TARGET_OS) && !defined(_MSC_VER) +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 * @@ -237,10 +272,10 @@ __hscore_seek_cur() INLINE HsInt __hscore_o_binary() { -#ifdef HAVE_O_BINARY +#if defined(_MSC_VER) return O_BINARY; #else - return 0; + return CONST_O_BINARY; #endif } @@ -349,7 +384,7 @@ __hscore_seek_end( void ) INLINE HsInt __hscore_setmode( HsInt fd, HsBool toBin ) { -#if defined(__MINGW32__) +#if defined(mingw32_TARGET_OS) || defined(_MSC_VER) return setmode(fd,(toBin == HS_BOOL_TRUE) ? _O_BINARY : _O_TEXT); #else return 0; @@ -360,28 +395,28 @@ INLINE HsInt __hscore_PrelHandle_write( HsInt fd, HsBool isSock, HsAddr ptr, HsInt off, int sz ) { -#if defined(__MINGW32__) +#if defined(mingw32_TARGET_OS) || defined(_MSC_VER) 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 ) { -#if defined(__MINGW32__) +#if defined(mingw32_TARGET_OS) || defined(_MSC_VER) 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); } -#if defined(__MINGW32__) +#if defined(mingw32_TARGET_OS) || defined(_MSC_VER) INLINE long * __hscore_Time_ghcTimezone( void ) { return &_timezone; } @@ -392,7 +427,7 @@ __hscore_Time_ghcTzname( void ) { return _tzname; } INLINE HsInt __hscore_mkdir( HsAddr pathName, HsInt mode ) { -#if defined(__MINGW32__) +#if defined(mingw32_TARGET_OS) || defined(_MSC_VER) return mkdir(pathName); #else return mkdir(pathName,mode); @@ -402,32 +437,54 @@ __hscore_mkdir( HsAddr pathName, HsInt mode ) INLINE HsInt __hscore_lstat( HsAddr fname, HsAddr st ) { -#ifdef HAVE_LSTAT +#if HAVE_LSTAT return lstat((const char*)fname, (struct stat*)st); #else return stat((const char*)fname, (struct stat*)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 +#ifdef R_OK INLINE mode_t __hscore_R_OK() { return R_OK; } +#endif +#ifdef W_OK INLINE mode_t __hscore_W_OK() { return W_OK; } +#endif +#ifdef X_OK INLINE mode_t __hscore_X_OK() { return X_OK; } +#endif +#ifdef S_IRUSR INLINE mode_t __hscore_S_IRUSR() { return S_IRUSR; } +#endif +#ifdef S_IWUSR INLINE mode_t __hscore_S_IWUSR() { return S_IWUSR; } +#endif +#ifdef S_IXUSR INLINE mode_t __hscore_S_IXUSR() { return S_IXUSR; } +#endif +#if !defined(_MSC_VER) INLINE HsAddr __hscore_d_name( struct dirent* d ) { -#ifndef mingw32_TARGET_OS +#if !defined(mingw32_TARGET_OS) && !defined(_MSC_VER) return (HsAddr)(&d->d_name); #else return (HsAddr)(d->d_name); #endif } +#endif INLINE HsInt __hscore_end_of_dir( void ) @@ -455,7 +512,9 @@ __hscore_sizeof_stat( void ) INLINE time_t __hscore_st_mtime ( struct stat* st ) { return st->st_mtime; } INLINE off_t __hscore_st_size ( struct stat* st ) { return st->st_size; } +#if !defined(_MSC_VER) INLINE mode_t __hscore_st_mode ( struct stat* st ) { return st->st_mode; } +#endif #if HAVE_TERMIOS_H INLINE tcflag_t __hscore_lflag( struct termios* ts ) { return ts->c_lflag; } @@ -466,7 +525,6 @@ __hscore_poke_lflag( struct termios* ts, tcflag_t t ) { ts->c_lflag = t; } INLINE unsigned char* __hscore_ptr_c_cc( struct termios* ts ) { return (unsigned char*) &ts->c_cc; } -#endif INLINE HsInt __hscore_sizeof_termios( void ) @@ -477,16 +535,15 @@ __hscore_sizeof_termios( void ) return 0; #endif } +#endif +#if !defined(mingw32_TARGET_OS) && !defined(_MSC_VER) INLINE HsInt __hscore_sizeof_sigset_t( void ) { -#ifndef mingw32_TARGET_OS return sizeof(sigset_t); -#else - return 0; -#endif } +#endif INLINE int __hscore_echo( void ) @@ -585,7 +642,48 @@ __hscore_f_setfl( void ) #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); } -#endif +#if !defined(mingw32_TARGET_OS) && !defined(_MSC_VER) +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_UNBLOCK; } +INLINE int __hsposix_SIG_SETMASK() { return SIG_SETMASK; } +#endif /* mingw32_TARGET_OS */ + +#endif /* __HSBASE_H__ */