diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Solver/STPBuilder.h | 4 | ||||
| -rw-r--r-- | lib/Solver/Solver.cpp | 3 |
2 files changed, 1 insertions, 6 deletions
diff --git a/lib/Solver/STPBuilder.h b/lib/Solver/STPBuilder.h index 2b34c911..3a19a639 100644 --- a/lib/Solver/STPBuilder.h +++ b/lib/Solver/STPBuilder.h @@ -17,11 +17,7 @@ #include <map> #define Expr VCExpr -#ifdef HAVE_EXT_STP #include <stp/c_interface.h> -#else -#include "../../stp/c_interface/c_interface.h" -#endif #if ENABLE_STPLOG == 1 #include "stp/stplog.h" diff --git a/lib/Solver/Solver.cpp b/lib/Solver/Solver.cpp index 9f0d89af..7430a58b 100644 --- a/lib/Solver/Solver.cpp +++ b/lib/Solver/Solver.cpp @@ -454,7 +454,6 @@ STPSolverImpl::STPSolverImpl(STPSolver *_solver, bool _useForkedSTP, bool _optim assert(vc && "unable to create validity checker"); assert(builder && "unable to create STPBuilder"); -#ifdef HAVE_EXT_STP // In newer versions of STP, a memory management mechanism has been // introduced that automatically invalidates certain C interface // pointers at vc_Destroy time. This caused double-free errors @@ -462,7 +461,7 @@ STPSolverImpl::STPSolverImpl(STPSolver *_solver, bool _useForkedSTP, bool _optim // the pointers using vc_DeleteExpr. By setting EXPRDELETE to 0 // we restore the old behaviour. vc_setInterfaceFlags(vc, EXPRDELETE, 0); -#endif + vc_registerErrorHandler(::stp_error_handler); if (useForkedSTP) { |