From: dons <unknown>
Date: Sat, 2 Oct 2004 07:14:38 +0000 (+0000)
Subject: [project @ 2004-10-02 07:14:38 by dons]
X-Git-Tag: nhc98-1-18-release~232
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=e0b4718ee302c4349eb892369b63098bc1e02488;p=ghc-base.git

[project @ 2004-10-02 07:14:38 by dons]
Undef PACKAGE_NAME PACKAGE_STRING PACKAGE_BUGREPORT PACKAGE_TARNAME
coming in from ghcconfig.h, so that we can use HsBaseConfig.h versions
without screenfulls of cpp warnings.
---

diff --git a/include/HsBase.h b/include/HsBase.h
index 5e7a767..1af22ca 100644
--- a/include/HsBase.h
+++ b/include/HsBase.h
@@ -10,6 +10,21 @@
 #define __HSBASE_H__
 
 #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"
 #include "HsFFI.h"