[project @ 2004-12-21 14:00:12 by simonpj]

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

diff --git a/include/HsBase.h b/include/HsBase.h
index c27140e..289f9b5 100644 (file)
--- a/include/HsBase.h
+++ b/include/HsBase.h
@@ -127,6 +127,10 @@
 #include <shlobj.h>
 #endif
 
+#if HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+
 /* in inputReady.c */
 int inputReady(int fd, int msecs, int isSock);
 
@@ -490,11 +494,7 @@ INLINE mode_t __hscore_S_IXUSR() { return S_IXUSR; }
 INLINE HsAddr
 __hscore_d_name( struct dirent* d )
 {
-#if defined(STRUCT_DIRENT_FLAT_LAYOUT)
-  return (HsAddr)(&d->d_name);
-#else
   return (HsAddr)(d->d_name);
-#endif
 }
 
 INLINE HsInt
@@ -713,6 +713,40 @@ INLINE int __hscore_fstat(int fd, struct stat *buf) {
        return (fstat(fd,buf));
 }
 
+// select-related stuff
+
+#if !defined(mingw32_TARGET_OS)
+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); }
+INLINE int  sizeof_fd_set(void) { return sizeof(fd_set); }
+extern void hsFD_ZERO(fd_set *fds);
+#endif
+
+// gettimeofday()-related
+
+#if !defined(mingw32_TARGET_OS)
+#define TICK_FREQ  50
+
+INLINE HsInt sizeofTimeVal(void) { return sizeof(struct timeval); }
+
+INLINE HsInt getTicksOfDay(void)
+{  
+    struct timeval tv;
+    gettimeofday(&tv, (struct timezone *) NULL);
+    return (tv.tv_sec * TICK_FREQ +
+           tv.tv_usec * TICK_FREQ / 1000000);
+}
+
+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_TARGET_OS)
+
+// Directory-related
+
 #if defined(mingw32_TARGET_OS)
 
 /* Make sure we've got the reqd CSIDL_ constants in scope;