Skip to content

Commit

Permalink
Merge 4b9882e into eedbbe6
Browse files Browse the repository at this point in the history
  • Loading branch information
patriq committed Nov 28, 2017
2 parents eedbbe6 + 4b9882e commit 6ffc157
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 1 deletion.
2 changes: 1 addition & 1 deletion dependencies/MiniSat/nusmv.patch
Expand Up @@ -564,7 +564,7 @@ diff -Naur minisat.ORIG/simp/Solver_C.C minisat/simp/Solver_C.C
+ return (MiniSat_ptr)new SimpSolver();
+}
+
+extern "C"void MiniSat_Delete(MiniSat_ptr ms)
+extern "C" void MiniSat_Delete(MiniSat_ptr ms)
+{
+ delete (SimpSolver *)ms;
+}
Expand Down
15 changes: 15 additions & 0 deletions dependencies/NuSMV/cudd.patch
Expand Up @@ -425,3 +425,18 @@
CFLAGS = $(ICFLAGS) $(MFLAG) $(XCFLAGS)

LINTFLAGS = -u -n
--- NuSMV-2.5.4/cudd-2.4.1.1/util/pipefork.c 2011-10-12 11:05:29.000000000 +0200
+++ CUDD/util/pipefork.c 2016-12-16 10:48:56.000000000 +0100
@@ -39,12 +39,7 @@ int util_pipefork(char **argv, /* normal argv argument list */
int forkpid, waitPid;
int topipe[2], frompipe[2];
char buffer[1024];
-
-#if (defined __hpux) || (defined __osf__) || (defined _IBMR2) || (defined __SVR4) || (defined __CYGWIN32__) || (defined __MINGW32__)
int status;
-#else
- union wait status;
-#endif

/* create the PIPES...
* fildes[0] for reading from command

0 comments on commit 6ffc157

Please sign in to comment.