X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=include%2FHsBase.h;h=75f9045482abb3a6780f2e33bcce3b367b47faf3;hb=d2ab743a74dfca780b405a4f4bac962f02a6672e;hp=1bcce332a4a8039e2d17572cc796d409a3ef340b;hpb=35bc624830a577f566b5c0b0cea68b0daff44880;p=ghc-base.git

diff --git a/include/HsBase.h b/include/HsBase.h
index 1bcce33..75f9045 100644
--- a/include/HsBase.h
+++ b/include/HsBase.h
@@ -1,6 +1,6 @@
 /* -----------------------------------------------------------------------------
  *
- * (c) The University of Glasgow 2001-2002
+ * (c) The University of Glasgow 2001-2004
  *
  * Definitions for package `base' which are visible in Haskell land.
  *
@@ -9,7 +9,17 @@
 #ifndef __HSBASE_H__
 #define __HSBASE_H__
 
-#include "config.h"
+#include "ghcconfig.h"
+
+/* ultra-evil... must come before HsBaseConfig.h */
+#undef PACKAGE_BUGREPORT
+#undef PACKAGE_NAME
+#undef PACKAGE_STRING
+#undef PACKAGE_TARNAME
+#undef PACKAGE_VERSION
+
+#include "HsBaseConfig.h"
+
 #include "HsFFI.h"
 
 #include <stdio.h>
@@ -108,20 +118,13 @@
 #include "lockFile.h"
 #include "dirUtils.h"
 
+#include "runProcess.h"
+
 #if defined(mingw32_TARGET_OS)
 #include <io.h>
 #include <fcntl.h>
 #include "timeUtils.h"
-#endif
-
-/* in system.c */
-HsInt systemCmd(HsAddr cmd);
-
-/* in rawSystem.c */
-#if defined(mingw32_TARGET_OS)
-HsInt rawSystem(HsAddr cmd);
-#else
-HsInt rawSystem(HsAddr cmd, HsAddr args);
+#include <shlobj.h>
 #endif
 
 /* in inputReady.c */
@@ -133,6 +136,12 @@ void writeErrString__(HsAddr msg, HsInt len);
 /* in Signals.c */
 extern HsInt nocldstop;
 
+#if !defined(mingw32_TARGET_OS)
+/* in execvpe.c */
+extern int execvpe(char *name, char *const argv[], char **envp);
+extern void pPrPr_disableITimers (void);
+#endif
+
 /* -----------------------------------------------------------------------------
    64-bit operations, defined in longlong.c
    -------------------------------------------------------------------------- */
@@ -478,26 +487,20 @@ INLINE mode_t __hscore_S_IWUSR() { return S_IWUSR; }
 INLINE mode_t __hscore_S_IXUSR() { return S_IXUSR; }
 #endif
 
-#if !defined(_MSC_VER)
 INLINE HsAddr
 __hscore_d_name( struct dirent* d )
 {
-#if !defined(mingw32_TARGET_OS) && !defined(_MSC_VER)
+#if defined(STRUCT_DIRENT_FLAT_LAYOUT)
   return (HsAddr)(&d->d_name);
 #else
   return (HsAddr)(d->d_name);
 #endif
 }
-#endif
 
 INLINE HsInt
 __hscore_end_of_dir( void )
 {
-#ifndef mingw32_TARGET_OS
-  return 0;
-#else
-  return ENOENT;
-#endif
+  return READDIR_ERRNO_EOF;
 }
 
 INLINE void
@@ -673,7 +676,7 @@ INLINE int __hsposix_SIGTTIN()   { return SIGTTIN; }
 INLINE int __hsposix_SIGTTOU()   { return SIGTTOU; }
 INLINE int __hsposix_SIGUSR1()   { return SIGUSR1; }
 INLINE int __hsposix_SIGUSR2()   { return SIGUSR2; }
-#if HAVE_SIGPOLL
+#ifdef SIGPOLL
 INLINE int __hsposix_SIGPOLL()   { return SIGPOLL; }
 #endif
 INLINE int __hsposix_SIGPROF()   { return SIGPROF; }
@@ -687,6 +690,7 @@ 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_TARGET_OS */
 
 // These are wrapped because on some OSs (eg. Linux) they are
@@ -709,5 +713,34 @@ INLINE int __hscore_fstat(int fd, struct stat *buf) {
 	return (fstat(fd,buf));
 }
 
+#if defined(mingw32_TARGET_OS)
+
+/* Make sure we've got the reqd CSIDL_ constants in scope;
+ * w32api header files are lagging a bit in defining the full set.
+ */
+#if !defined(CSIDL_APPDATA)
+#define CSIDL_APPDATA 0x001a
+#endif
+#if !defined(CSIDL_PERSONAL)
+#define CSIDL_PERSONAL 0x0005
+#endif
+#if !defined(CSIDL_PROFILE)
+#define CSIDL_PROFILE 0x0028
+#endif
+#if !defined(CSIDL_WINDOWS)
+#define CSIDL_WINDOWS 0x0024
+#endif
+
+INLINE int __hscore_CSIDL_PROFILE()  { return CSIDL_PROFILE;  }
+INLINE int __hscore_CSIDL_APPDATA()  { return CSIDL_APPDATA;  }
+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__ */