X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=include%2FHsBase.h;h=d3fc3a2c0b042d62ac888af504b7ff0f62ee527d;hb=010262453e6f3a577cf1fb91d98bf1648f3e9bc0;hp=0b24bc18323436f9f7cf81a8ec5fdd6d57739671;hpb=e5ee0cfcdeb0f2c072330113ef5062b4c1f6b18d;p=ghc-base.git diff --git a/include/HsBase.h b/include/HsBase.h index 0b24bc1..d3fc3a2 100644 --- a/include/HsBase.h +++ b/include/HsBase.h @@ -1,5 +1,4 @@ /* ----------------------------------------------------------------------------- - * $Id: HsBase.h,v 1.31 2003/10/13 03:19:48 sof Exp $ * * (c) The University of Glasgow 2001-2002 * @@ -17,73 +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 -#ifdef HAVE_SYS_UTSNAME_H +#if HAVE_SYS_UTSNAME_H #include #endif -#if defined(HAVE_GETTIMEOFDAY) -# ifdef HAVE_SYS_TIME_H +#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 -#ifdef HAVE_WCTYPE_H +#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 @@ -95,24 +99,21 @@ #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" -#if defined(__MINGW32__) +#if defined(mingw32_TARGET_OS) #include #include #include "timeUtils.h" #endif -/* in ghc_errno.c */ -int *ghcErrno(void); - /* in system.c */ HsInt systemCmd(HsAddr cmd); @@ -127,7 +128,7 @@ HsInt rawSystem(HsAddr cmd, HsAddr args); int inputReady(int fd, int msecs, int isSock); /* in writeError.c */ -void writeErrString__(HsAddr msg_hdr, HsAddr msg, HsInt len); +void writeErrString__(HsAddr msg, HsInt len); /* in Signals.c */ extern HsInt nocldstop; @@ -197,12 +198,17 @@ StgWord64 stg_integerToWord64 (StgInt sa, StgByteArray /* Really: mp_limb_t* */ #ifndef INLINE # if defined(_MSC_VER) # define INLINE extern __inline +# elif defined(__HUGS__) +# define INLINE INLINE_ONLY # else # define INLINE extern inline # endif #endif -#if !defined(_MSC_VER) && !defined(__MINGW__) +INLINE int __hscore_get_errno(void) { return errno; } +INLINE void __hscore_set_errno(int e) { errno = e; } + +#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); } @@ -213,7 +219,7 @@ INLINE int __hscore_s_issock(m) { return S_ISSOCK(m); } #endif #endif -#if !defined(mingw32_TARGET_OS) && !defined(_MSC_VER) && !defined(__MINGW__) +#if !defined(mingw32_TARGET_OS) && !defined(_MSC_VER) INLINE int __hscore_sigemptyset( sigset_t *set ) { return sigemptyset(set); } @@ -380,39 +386,39 @@ __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; -#endif +#endif } INLINE HsInt -__hscore_PrelHandle_write( HsInt fd, HsBool isSock, HsAddr ptr, - HsInt off, int sz ) +__hscore_PrelHandle_write( HsInt fd, HsAddr ptr, HsInt off, int sz ) { -#if defined(__MINGW32__) - if (isSock) { - return send(fd,(char *)ptr + off, sz, 0); - } -#endif return write(fd,(char *)ptr + off, sz); } INLINE HsInt -__hscore_PrelHandle_read( HsInt fd, HsBool isSock, HsAddr ptr, - HsInt off, int sz ) +__hscore_PrelHandle_read( HsInt fd, HsAddr ptr, HsInt off, int sz ) { -#if defined(__MINGW32__) - if (isSock) { - return recv(fd,(char *)ptr + off, sz, 0); - } -#endif return read(fd,(char *)ptr + off, sz); } -#if defined(__MINGW32__) +INLINE HsInt +__hscore_PrelHandle_send( HsInt fd, HsAddr ptr, HsInt off, int sz ) +{ + return send(fd,(char *)ptr + off, sz, 0); +} + +INLINE HsInt +__hscore_PrelHandle_recv( HsInt fd, HsAddr ptr, HsInt off, int sz ) +{ + return recv(fd,(char *)ptr + off, sz, 0); +} + +#if defined(mingw32_TARGET_OS) || defined(_MSC_VER) INLINE long * __hscore_Time_ghcTimezone( void ) { return &_timezone; } @@ -423,7 +429,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); @@ -433,7 +439,7 @@ __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); @@ -470,11 +476,11 @@ INLINE mode_t __hscore_S_IWUSR() { return S_IWUSR; } INLINE mode_t __hscore_S_IXUSR() { return S_IXUSR; } #endif -#if !defined(_MSC_VER) && !defined(__MINGW__) +#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); @@ -489,7 +495,7 @@ __hscore_end_of_dir( void ) return 0; #else return ENOENT; -#endif +#endif } INLINE void @@ -508,7 +514,7 @@ __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) && !defined(__MINGW__) +#if !defined(_MSC_VER) INLINE mode_t __hscore_st_mode ( struct stat* st ) { return st->st_mode; } #endif @@ -519,7 +525,7 @@ INLINE void __hscore_poke_lflag( struct termios* ts, tcflag_t t ) { ts->c_lflag = t; } INLINE unsigned char* -__hscore_ptr_c_cc( struct termios* ts ) +__hscore_ptr_c_cc( struct termios* ts ) { return (unsigned char*) &ts->c_cc; } INLINE HsInt @@ -533,15 +539,11 @@ __hscore_sizeof_termios( void ) } #endif -#if !defined(_MSC_VER) && !defined(__MINGW__) +#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 @@ -648,7 +650,7 @@ extern void __hscore_set_saved_termios(int fd, void* ts); INLINE int __hscore_hs_fileno (FILE *f) { return fileno (f); } -#if !defined(mingw32_TARGET_OS) && !defined(_MSC_VER) && !defined(__MINGW32__) +#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; } @@ -681,9 +683,29 @@ 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; } +INLINE int __hsposix_SIG_UNBLOCK() { return SIG_UNBLOCK; } +INLINE int __hsposix_SIG_SETMASK() { return SIG_SETMASK; } #endif /* mingw32_TARGET_OS */ +// These are wrapped because on some OSs (eg. Linux) they are +// macros which redirect to the 64-bit-off_t versions when large file +// support is enabled. +// +INLINE int __hscore_open(char *file, int how, mode_t mode) { + return (open(file,how,mode)); +} + +INLINE off_t __hscore_lseek(int fd, off_t off, int whence) { + return (lseek(fd,off,whence)); +} + +INLINE int __hscore_stat(char *file, struct stat *buf) { + return (stat(file,buf)); +} + +INLINE int __hscore_fstat(int fd, struct stat *buf) { + return (fstat(fd,buf)); +} + #endif /* __HSBASE_H__ */