X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=include%2FHsBase.h;h=aa1a7fb63f75fe64ab9a8924788a33709760989a;hb=c1a7d1856f1af6450ae3e04072b9d36960bc2257;hp=a10508045e2e631a3e56a595b530f61a5cca3963;hpb=3457025838609e26918bb0cf5c16393d3bb5b69b;p=haskell-directory.git diff --git a/include/HsBase.h b/include/HsBase.h index a105080..aa1a7fb 100644 --- a/include/HsBase.h +++ b/include/HsBase.h @@ -9,8 +9,6 @@ #ifndef __HSBASE_H__ #define __HSBASE_H__ -#include "ghcconfig.h" - #include "HsBaseConfig.h" /* ultra-evil... */ @@ -20,6 +18,11 @@ #undef PACKAGE_TARNAME #undef PACKAGE_VERSION +/* Needed to get the macro version of errno on some OSs (eg. Solaris). + We must do this, because these libs are only compiled once, but + must work in both single-threaded and multi-threaded programs. */ +#define _REENTRANT 1 + #include "HsFFI.h" #include @@ -86,7 +89,7 @@ #if HAVE_SYS_TIMES_H #include #endif -#if HAVE_WINSOCK_H && defined(mingw32_HOST_OS) +#if HAVE_WINSOCK_H && defined(__MINGW32__) #include #endif #if HAVE_LIMITS_H @@ -95,17 +98,24 @@ #if HAVE_WCTYPE_H #include #endif +#if HAVE_INTTYPES_H +# include +#elif HAVE_STDINT_H +# include +#endif -#if !defined(mingw32_HOST_OS) && !defined(irix_HOST_OS) +#if !defined(__MINGW32__) && !defined(irix_HOST_OS) # if HAVE_SYS_RESOURCE_H # include # endif #endif -#ifdef hpux_HOST_OS -#include -#define getrusage(a, b) syscall(SYS_GETRUSAGE, a, b) -#define HAVE_GETRUSAGE +#if !HAVE_GETRUSAGE && HAVE_SYS_SYSCALL_H +# include +# if defined(SYS_GETRUSAGE) /* hpux_HOST_OS */ +# define getrusage(a, b) syscall(SYS_GETRUSAGE, a, b) +# define HAVE_GETRUSAGE 1 +# endif #endif /* For System */ @@ -121,7 +131,7 @@ #include "runProcess.h" -#if defined(mingw32_HOST_OS) +#if defined(__MINGW32__) #include #include #include "timeUtils.h" @@ -139,7 +149,7 @@ int inputReady(int fd, int msecs, int isSock); /* in Signals.c */ extern HsInt nocldstop; -#if !defined(mingw32_HOST_OS) +#if !defined(_MSC_VER) && !defined(__MINGW32__) && !defined(_WIN32) /* in execvpe.c */ extern int execvpe(char *name, char *const argv[], char **envp); extern void pPrPr_disableITimers (void); @@ -210,10 +220,10 @@ 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 +# elif defined(__GNUC__) # define INLINE extern inline +# else +# define INLINE inline # endif #endif @@ -231,7 +241,7 @@ INLINE int __hscore_s_issock(m) { return S_ISSOCK(m); } #endif #endif -#if !defined(mingw32_HOST_OS) && !defined(_MSC_VER) +#if !defined(_MSC_VER) && !defined(__MINGW32__) && !defined(_WIN32) INLINE int __hscore_sigemptyset( sigset_t *set ) { return sigemptyset(set); } @@ -264,7 +274,7 @@ __hscore_memcpy_src_off( char *dst, char *src, int src_off, size_t sz ) INLINE HsBool __hscore_supportsTextMode() { -#if defined(mingw32_HOST_OS) +#if defined(_MSC_VER) || defined(__MINGW32__) || defined(_WIN32) return HS_BOOL_FALSE; #else return HS_BOOL_TRUE; @@ -410,13 +420,15 @@ __hscore_ftruncate( int fd, off_t where ) INLINE HsInt __hscore_setmode( HsInt fd, HsBool toBin ) { -#if defined(mingw32_HOST_OS) || defined(_MSC_VER) +#if defined(_MSC_VER) || defined(__MINGW32__) || defined(_WIN32) return setmode(fd,(toBin == HS_BOOL_TRUE) ? _O_BINARY : _O_TEXT); #else return 0; #endif } +#if __GLASGOW_HASKELL__ + INLINE HsInt __hscore_PrelHandle_write( HsInt fd, HsAddr ptr, HsInt off, int sz ) { @@ -430,7 +442,7 @@ __hscore_PrelHandle_read( HsInt fd, HsAddr ptr, HsInt off, int sz ) } -#if defined(mingw32_HOST_OS) || defined(_MSC_VER) +#if defined(_MSC_VER) || defined(__MINGW32__) || defined(_WIN32) INLINE HsInt __hscore_PrelHandle_send( HsInt fd, HsAddr ptr, HsInt off, int sz ) { @@ -444,18 +456,12 @@ __hscore_PrelHandle_recv( HsInt fd, HsAddr ptr, HsInt off, int sz ) } #endif -#if defined(mingw32_HOST_OS) || defined(_MSC_VER) -INLINE long * -__hscore_Time_ghcTimezone( void ) { return &_timezone; } - -INLINE char ** -__hscore_Time_ghcTzname( void ) { return _tzname; } -#endif +#endif /* __GLASGOW_HASKELL__ */ INLINE HsInt __hscore_mkdir( HsAddr pathName, HsInt mode ) { -#if defined(mingw32_HOST_OS) || defined(_MSC_VER) +#if defined(_MSC_VER) || defined(__MINGW32__) || defined(_WIN32) return mkdir(pathName); #else return mkdir(pathName,mode); @@ -547,7 +553,7 @@ __hscore_ptr_c_cc( struct termios* ts ) INLINE HsInt __hscore_sizeof_termios( void ) { -#ifndef mingw32_HOST_OS +#ifndef __MINGW32__ return sizeof(struct termios); #else return 0; @@ -555,7 +561,7 @@ __hscore_sizeof_termios( void ) } #endif -#if !defined(mingw32_HOST_OS) && !defined(_MSC_VER) +#if !defined(_MSC_VER) && !defined(__MINGW32__) && !defined(_WIN32) INLINE HsInt __hscore_sizeof_sigset_t( void ) { @@ -667,7 +673,7 @@ extern void __hscore_set_saved_termios(int fd, void* ts); INLINE int __hscore_hs_fileno (FILE *f) { return fileno (f); } INLINE int __hscore_open(char *file, int how, mode_t mode) { -#ifdef mingw32_HOST_OS +#ifdef __MINGW32__ if ((how & O_WRONLY) || (how & O_RDWR) || (how & O_APPEND)) return _sopen(file,how,_SH_DENYRW,mode); else @@ -695,7 +701,8 @@ INLINE int __hscore_fstat(int fd, struct stat *buf) { // select-related stuff -#if !defined(mingw32_HOST_OS) +#if !defined(__MINGW32__) +INLINE int hsFD_SETSIZE(void) { return FD_SETSIZE; } INLINE void hsFD_CLR(int fd, fd_set *fds) { FD_CLR(fd, fds); } INLINE int hsFD_ISSET(int fd, fd_set *fds) { return FD_ISSET(fd, fds); } INLINE void hsFD_SET(int fd, fd_set *fds) { FD_SET(fd, fds); } @@ -705,7 +712,7 @@ extern void hsFD_ZERO(fd_set *fds); // gettimeofday()-related -#if !defined(mingw32_HOST_OS) +#if !defined(__MINGW32__) #define TICK_FREQ 50 INLINE HsInt sizeofTimeVal(void) { return sizeof(struct timeval); } @@ -723,11 +730,11 @@ INLINE void setTimevalTicks(struct timeval *p, HsInt ticks) p->tv_sec = ticks / TICK_FREQ; p->tv_usec = (ticks % TICK_FREQ) * (1000000 / TICK_FREQ); } -#endif /* !defined(mingw32_HOST_OS) */ +#endif /* !defined(__MINGW32__) */ // Directory-related -#if defined(mingw32_HOST_OS) +#if defined(__MINGW32__) /* Make sure we've got the reqd CSIDL_ constants in scope; * w32api header files are lagging a bit in defining the full set. @@ -751,10 +758,20 @@ INLINE int __hscore_CSIDL_WINDOWS() { return CSIDL_WINDOWS; } INLINE int __hscore_CSIDL_PERSONAL() { return CSIDL_PERSONAL; } #endif +#if defined(__MINGW32__) +INLINE unsigned int __hscore_get_osver(void) { return _osver; } +#endif + /* ToDo: write a feature test that doesn't assume 'environ' to * be in scope at link-time. */ extern char** environ; INLINE char **__hscore_environ() { return environ; } +/* lossless conversions between pointers and integral types */ +INLINE void * __hscore_from_uintptr(uintptr_t n) { return (void *)n; } +INLINE void * __hscore_from_intptr (intptr_t n) { return (void *)n; } +INLINE uintptr_t __hscore_to_uintptr (void *p) { return (uintptr_t)p; } +INLINE intptr_t __hscore_to_intptr (void *p) { return (intptr_t)p; } + #endif /* __HSBASE_H__ */