From 1592fc057fa81ca9714f5761325f61ad0c15747a Mon Sep 17 00:00:00 2001
From: Daniel Dunbar <daniel@zuster.org>
Date: Fri, 12 Sep 2014 14:06:30 -0700
Subject: Tweak the workarounds for multiple definition of PACKAGE_* macros
 from config.h files.

 - There seems to be a better solution for this by defining a macro prefix, per:

     http://www.gnu.org/software/autoconf-archive/ax_prefix_config_h.html

   but I have no experience with that and it looks like it might involve
   rewriting a bunch of our macro checks.
---
 tools/klee/main.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'tools')

diff --git a/tools/klee/main.cpp b/tools/klee/main.cpp
index aecf6991..f0f8cbe2 100644
--- a/tools/klee/main.cpp
+++ b/tools/klee/main.cpp
@@ -13,6 +13,13 @@
 #include "klee/Internal/Support/ModuleUtil.h"
 #include "klee/Internal/System/Time.h"
 
+// FIXME: Ugh, this is gross. But otherwise our config.h conflicts with LLVMs.
+#undef PACKAGE_BUGREPORT
+#undef PACKAGE_NAME
+#undef PACKAGE_STRING
+#undef PACKAGE_TARNAME
+#undef PACKAGE_VERSION
+
 #if LLVM_VERSION_CODE > LLVM_VERSION(3, 2)
 #include "llvm/IR/Constants.h"
 #include "llvm/IR/Module.h"
@@ -39,12 +46,6 @@
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/raw_ostream.h"
 
-// FIXME: Ugh, this is gross. But otherwise our config.h conflicts with LLVMs.
-#undef PACKAGE_BUGREPORT
-#undef PACKAGE_NAME
-#undef PACKAGE_STRING
-#undef PACKAGE_TARNAME
-#undef PACKAGE_VERSION
 #if LLVM_VERSION_CODE < LLVM_VERSION(3, 0)
 #include "llvm/Target/TargetSelect.h"
 #else
-- 
cgit 1.4.1