From 7ab5f7b6ca7155e0db967afac6e20d046f72bfd0 Mon Sep 17 00:00:00 2001 From: David Monniaux Date: Wed, 20 Mar 2019 13:09:42 +0100 Subject: picosat fonctionne --- test/monniaux/picosat-965/app.c | 8 ++++++-- test/monniaux/picosat-965/dm_configure_ccomp.sh | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'test/monniaux/picosat-965') diff --git a/test/monniaux/picosat-965/app.c b/test/monniaux/picosat-965/app.c index d55d7e1b..d817cf21 100644 --- a/test/monniaux/picosat-965/app.c +++ b/test/monniaux/picosat-965/app.c @@ -12,8 +12,10 @@ #define BUNZIP2 "bzcat %s" #define GZIP "gzip -c -f > %s" +#if 0 FILE * popen (const char *, const char*); int pclose (FILE *); +#endif static PicoSAT * picosat; @@ -49,7 +51,7 @@ parse (PicoSAT * picosat, int force) int ch, sign, lit, vars, clauses; lineno = 1; - inputid = fileno (input); + /* DM inputid = fileno (input); */ SKIP_COMMENTS: ch = next (); @@ -359,9 +361,11 @@ write_to_file (PicoSAT * picosat, writer (picosat, file); +#ifndef NZIP if (pclose_file) pclose (file); else +#endif fclose (file); } else @@ -652,7 +656,7 @@ picosat_main (int argc, char **argv) err = 1; } else - propagation_limit = atoll (argv[i]); + propagation_limit = atol /* DM */ (argv[i]); } else if (!strcmp (argv[i], "-i")) { diff --git a/test/monniaux/picosat-965/dm_configure_ccomp.sh b/test/monniaux/picosat-965/dm_configure_ccomp.sh index 457d2856..3be58a48 100755 --- a/test/monniaux/picosat-965/dm_configure_ccomp.sh +++ b/test/monniaux/picosat-965/dm_configure_ccomp.sh @@ -1,2 +1,2 @@ # BUG -CC=../../../ccomp CFLAGS="-fall -Wall -O3 -DNALARM -DNZIP -DNGETRUSAGE" ./configure.sh +CC=../../../ccomp CFLAGS="-fall -Wall -fno-unprototyped -O3 -DNALARM -DNZIP -DNGETRUSAGE" ./configure.sh -- cgit