X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=include%2FHsBase.h;h=289f9b5f0d9448e115078716a6686201f156f2d3;hb=edc5c57d653289a1cf8dd2b05bf94ed25975e28a;hp=1af22ca4f0214a3bd0be4fa1f619a6920eba7554;hpb=e0b4718ee302c4349eb892369b63098bc1e02488;p=ghc-base.git

diff --git a/include/HsBase.h b/include/HsBase.h
index 1af22ca..289f9b5 100644
--- a/include/HsBase.h
+++ b/include/HsBase.h
@@ -11,21 +11,15 @@
 
 #include "ghcconfig.h"
 
-/* redefined in HsBaseConfig.h */
-#ifdef PACKAGE_NAME
-# undef PACKAGE_NAME
-#endif
-#ifdef PACKAGE_STRING
-# undef PACKAGE_STRING
-#endif
-#ifdef PACKAGE_BUGREPORT
-# undef PACKAGE_BUGREPORT
-#endif
-#ifdef PACKAGE_TARNAME
-# undef PACKAGE_TARNAME
-#endif
-
 #include "HsBaseConfig.h"
+
+/* ultra-evil... */
+#undef PACKAGE_BUGREPORT
+#undef PACKAGE_NAME
+#undef PACKAGE_STRING
+#undef PACKAGE_TARNAME
+#undef PACKAGE_VERSION
+
 #include "HsFFI.h"
 
 #include <stdio.h>
@@ -133,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);
 
@@ -496,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
@@ -719,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;
@@ -743,5 +771,10 @@ INLINE int __hscore_CSIDL_WINDOWS()  { return CSIDL_WINDOWS;  }
 INLINE int __hscore_CSIDL_PERSONAL() { return CSIDL_PERSONAL; }
 #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; }
+
 #endif /* __HSBASE_H__ */