summaryrefslogtreecommitdiff
path: root/src/prop/bvminisat
diff options
context:
space:
mode:
authorLiana Hadarean <lianahady@gmail.com>2012-02-29 20:33:43 +0000
committerLiana Hadarean <lianahady@gmail.com>2012-02-29 20:33:43 +0000
commit2821b7a47e779c7d4f189ffdffaebe4bdb5b9036 (patch)
tree16101f79b9c8927645fa896306c1e5cb83721332 /src/prop/bvminisat
parent9062483193f4ec9b38aaa57b228cae1fb551566a (diff)
This should fix the debian build fails:
* removed bvpicosat directory as it is currently not used Cleared some of the flurry of warnings my previous merge caused in src/prop/
Diffstat (limited to 'src/prop/bvminisat')
-rw-r--r--src/prop/bvminisat/core/SolverTypes.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/prop/bvminisat/core/SolverTypes.h b/src/prop/bvminisat/core/SolverTypes.h
index 3709715b9..0439a46c4 100644
--- a/src/prop/bvminisat/core/SolverTypes.h
+++ b/src/prop/bvminisat/core/SolverTypes.h
@@ -80,9 +80,18 @@ const Lit lit_Error = { -1 }; // }
// does enough constant propagation to produce sensible code, and this appears to be somewhat
// fragile unfortunately.
+
+#ifndef l_True
#define l_True (lbool((uint8_t)0)) // gcc does not do constant propagation if these are real constants.
+#endif
+
+#ifndef l_False
#define l_False (lbool((uint8_t)1))
+#endif
+
+#ifndef l_Undef
#define l_Undef (lbool((uint8_t)2))
+#endif
class lbool {
uint8_t value;
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback