user push/pop support in minisat and simplification; also bindings work

1 files changed, 9 insertions, 5 deletions

diff --git a/src/cvc4.i b/src/cvc4.i
index 7f7926bfd..0e2f48dba 100644
--- a/src/cvc4.i
+++ b/src/cvc4.i
@@ -40,6 +40,13 @@ using namespace CVC4;
 %template(setType) std::set< CVC4::Type >;
 %template(hashmapExpr) std::hash_map< CVC4::Expr, CVC4::Expr, CVC4::ExprHashFunction >;
 
+// This is unfortunate, but seems to be necessary; if we leave NULL
+// defined, swig will expand it to "(void*) 0", and some of swig's
+// helper functions won't compile properly.
+#undef NULL
+
+#ifdef SWIGJAVA
+
 %exception {
   try {
     $action
@@ -50,16 +57,13 @@ using namespace CVC4;
   }
 }
 
-// This is unfortunate, but seems to be necessary; if we leave NULL
-// defined, swig will expand it to "(void*) 0", and some of swig's
-// helper functions won't compile properly.
-#undef NULL
-
 %include "java/typemaps.i" // primitive pointers and references
 %include "java/std_string.i" // map std::string to java.lang.String
 %include "java/arrays_java.i" // C arrays to Java arrays
 %include "java/various.i" // map char** to java.lang.String[]
 
+#endif /* SWIGJAVA */
+
 %include "util/integer.i"
 %include "util/rational.i"
 %include "util/stats.i"