diff options
| author |  panne <unknown> | 2004-09-22 09:14:23 +0000 |
|---|---|---|
| committer | panne <unknown> | 2004-09-22 09:14:23 +0000 |
| commit | c6931a546b5d1b4b272657701c247afdd6d12cf7 (patch) | |
| tree | b3efcb8f966ff31dcd695c4f729b34a7f2037b68 /include | |
| parent | 1cd9ff3aaaa2a6c2a2172c4810af365c39fc8674 (diff) | |
[project @ 2004-09-22 09:14:23 by panne]
As a temporary measure, use an ultra-evil sledgehammer method to silence the
PACKAGE_FOO clashes. The correct way of doing this would be splitting up
HsPACKAGE.h and ghcconfig.h into two parts each: One part would be generated by
autoheader and would contain the defines which are needed during package build
time only. The other part would contain all kinds of stuff which is needed for
using the given package (no PACKAGE_FOO defines here). For an example of this,
see the OpenAL package. As an additional benefit, this would keep the namespace
much cleaner, because 2nd kind of headers is typically smaller.
No time for the real thing currently, hope the current workaround works...
Diffstat (limited to 'include')
| -rw-r--r-- | include/HsUnix.h | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/include/HsUnix.h b/include/HsUnix.h index 49c8a9d..db55dc9 100644 --- a/include/HsUnix.h +++ b/include/HsUnix.h @@ -1,5 +1,4 @@ /* ----------------------------------------------------------------------------- - * $Id: HsUnix.h,v 1.16 2004/09/15 15:55:46 stolz Exp $ * * (c) The University of Glasgow 2002 * @@ -11,8 +10,23 @@ #define HSUNIX_H #include "ghcconfig.h" + +/* ultra-evil... */ +#undef PACKAGE_BUGREPORT +#undef PACKAGE_NAME +#undef PACKAGE_STRING +#undef PACKAGE_TARNAME +#undef PACKAGE_VERSION + #include "HsUnixConfig.h" +/* ultra-evil... */ +#undef PACKAGE_BUGREPORT +#undef PACKAGE_NAME +#undef PACKAGE_STRING +#undef PACKAGE_TARNAME +#undef PACKAGE_VERSION + #include <stdlib.h> #include <stdio.h> |