[commit: packages/time] master: #undef PACKAGE_NAME and friends to avoid clashes (2f36990)

git at git.haskell.org git at git.haskell.org
Fri Jan 23 22:58:26 UTC 2015


Repository : ssh://git@git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/2f369900a7bb45aa52dede558fa5364a1a7a7e13

>---------------------------------------------------------------

commit 2f369900a7bb45aa52dede558fa5364a1a7a7e13
Author: Simon Marlow <simonmar at microsoft.com>
Date:   Wed Jun 6 07:20:42 2007 -0700

    #undef PACKAGE_NAME and friends to avoid clashes
    
    darcs-hash:20070606142042-760e2-20bc4e080e1edf8b0e12fd8c5b68da9d21e89c79


>---------------------------------------------------------------

2f369900a7bb45aa52dede558fa5364a1a7a7e13
 include/HsTime.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/include/HsTime.h b/include/HsTime.h
index 059cbc0..c02cc53 100644
--- a/include/HsTime.h
+++ b/include/HsTime.h
@@ -2,6 +2,12 @@
 #define __HSTIME_H__
 
 #include "HsTimeConfig.h"
+// Otherwise these clash with similar definitions from other packages:
+#undef PACKAGE_BUGREPORT
+#undef PACKAGE_NAME
+#undef PACKAGE_STRING
+#undef PACKAGE_TARNAME
+#undef PACKAGE_VERSION
 
 #if HAVE_TIME_H
 #include <time.h>



More information about the ghc-commits mailing list