#define _REENTRANT 1 (needed to get the right errno on some OSs)

[ghc-base.git] / include / HsBase.h

diff --git a/include/HsBase.h b/include/HsBase.h
index e8b7ae3..682d808 100644 (file)
--- a/include/HsBase.h
+++ b/include/HsBase.h
@@ -20,6 +20,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 <stdio.h>
@@ -95,6 +100,11 @@
 #if HAVE_WCTYPE_H
 #include <wctype.h>
 #endif
+#if HAVE_INTTYPES_H
+# include <inttypes.h>
+#elif HAVE_STDINT_H
+# include <stdint.h>
+#endif
 
 #if !defined(mingw32_HOST_OS) && !defined(irix_HOST_OS)
 # if HAVE_SYS_RESOURCE_H
@@ -117,6 +127,7 @@
 #endif
 #include "lockFile.h"
 #include "dirUtils.h"
+#include "WCsubst.h"
 
 #include "runProcess.h"
 
@@ -135,9 +146,6 @@
 /* in inputReady.c */
 int inputReady(int fd, int msecs, int isSock);
 
-/* in writeError.c */
-void writeErrString__(HsAddr msg, HsInt len);
-
 /* in Signals.c */
 extern HsInt nocldstop;
 
@@ -212,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
 
@@ -419,6 +427,8 @@ __hscore_setmode( HsInt fd, HsBool toBin )
 #endif
 }
 
+#if __GLASGOW_HASKELL__
+
 INLINE HsInt
 __hscore_PrelHandle_write( HsInt fd, HsAddr ptr, HsInt off, int sz )
 {
@@ -446,6 +456,8 @@ __hscore_PrelHandle_recv( HsInt fd, HsAddr ptr, HsInt off, int sz )
 }
 #endif
 
+#endif /* __GLASGOW_HASKELL__ */
+
 #if defined(mingw32_HOST_OS) || defined(_MSC_VER)
 INLINE long *
 __hscore_Time_ghcTimezone( void ) { return &_timezone; }
@@ -668,44 +680,6 @@ extern void __hscore_set_saved_termios(int fd, void* ts);
 
 INLINE int __hscore_hs_fileno (FILE *f) { return fileno (f); }
 
-#if !defined(mingw32_HOST_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; }
-#ifdef 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_HOST_OS */
-
 INLINE int __hscore_open(char *file, int how, mode_t mode) {
 #ifdef mingw32_HOST_OS
        if ((how & O_WRONLY) || (how & O_RDWR) || (how & O_APPEND))
@@ -736,6 +710,7 @@ INLINE int __hscore_fstat(int fd, struct stat *buf) {
 // select-related stuff
 
 #if !defined(mingw32_HOST_OS)
+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); }
@@ -763,7 +738,7 @@ 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_HOST_OS) */
 
 // Directory-related
 
@@ -791,10 +766,20 @@ INLINE int __hscore_CSIDL_WINDOWS()  { return CSIDL_WINDOWS;  }
 INLINE int __hscore_CSIDL_PERSONAL() { return CSIDL_PERSONAL; }
 #endif
 
+#if defined(mingw32_HOST_OS)
+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__ */