[project @ 2004-10-06 23:45:37 by dons]

[haskell-directory.git] / include / HsBase.h

diff --git a/include/HsBase.h b/include/HsBase.h
index c4f0116..75f9045 100644 (file)
--- a/include/HsBase.h
+++ b/include/HsBase.h
@@ -10,7 +10,16 @@
 #define __HSBASE_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>
@@ -127,9 +136,11 @@ 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
@@ -726,5 +737,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__ */