summaryrefslogtreecommitdiff
path: root/libs/minisat
diff options
context:
space:
mode:
authorClifford Wolf <clifford@clifford.at>2014-07-25 03:31:16 +0200
committerClifford Wolf <clifford@clifford.at>2014-07-25 03:41:54 +0200
commit6789e3002aadb78623b9205492d14bbafb3e39eb (patch)
tree5f45f55e6a2410d309bc82a515a4889ff80bf38a /libs/minisat
parente4a0ab9bedcf357551c0faf548317e0998d5a4d1 (diff)
Removed Minisat dependency on zlib
Diffstat (limited to 'libs/minisat')
-rw-r--r--libs/minisat/00_PATCH_mkLit_default_arg.patch (renamed from libs/minisat/PATCH_mkLit_default_arg.patch)0
-rw-r--r--libs/minisat/00_PATCH_remove_zlib.patch38
-rw-r--r--libs/minisat/00_UPDATE.sh (renamed from libs/minisat/UPDATE.sh)3
-rw-r--r--libs/minisat/ParseUtils.h14
4 files changed, 42 insertions, 13 deletions
diff --git a/libs/minisat/PATCH_mkLit_default_arg.patch b/libs/minisat/00_PATCH_mkLit_default_arg.patch
index e21683f9..e21683f9 100644
--- a/libs/minisat/PATCH_mkLit_default_arg.patch
+++ b/libs/minisat/00_PATCH_mkLit_default_arg.patch
diff --git a/libs/minisat/00_PATCH_remove_zlib.patch b/libs/minisat/00_PATCH_remove_zlib.patch
new file mode 100644
index 00000000..61a36f7e
--- /dev/null
+++ b/libs/minisat/00_PATCH_remove_zlib.patch
@@ -0,0 +1,38 @@
+--- ParseUtils.h
++++ ParseUtils.h
+@@ -24,8 +24,6 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
+ #include <stdlib.h>
+ #include <stdio.h>
+
+-#include <zlib.h>
+-
+ #include "XAlloc.h"
+
+ namespace Minisat {
+@@ -36,24 +34,16 @@ namespace Minisat {
+
+
+ class StreamBuffer {
+- gzFile in;
+ unsigned char* buf;
+ int pos;
+ int size;
+
+ enum { buffer_size = 64*1024 };
+
+- void assureLookahead() {
+- if (pos >= size) {
+- pos = 0;
+- size = gzread(in, buf, buffer_size); } }
++ virtual void assureLookahead() = 0;
+
+ public:
+- explicit StreamBuffer(gzFile i) : in(i), pos(0), size(0){
+- buf = (unsigned char*)xrealloc(NULL, buffer_size);
+- assureLookahead();
+- }
+- ~StreamBuffer() { free(buf); }
++ virtual ~StreamBuffer() { }
+
+ int operator * () const { return (pos >= size) ? EOF : buf[pos]; }
+ void operator ++ () { pos++; assureLookahead(); }
diff --git a/libs/minisat/UPDATE.sh b/libs/minisat/00_UPDATE.sh
index fa72ba21..96a34ec9 100644
--- a/libs/minisat/UPDATE.sh
+++ b/libs/minisat/00_UPDATE.sh
@@ -12,5 +12,6 @@ sed -i -e 's/PRI[iu]64/ & /' Options.h Solver.cc
sed -i -e '1 i #define __STDC_LIMIT_MACROS' *.cc
sed -i -e '1 i #define __STDC_FORMAT_MACROS' *.cc
-patch -p0 < PATCH_mkLit_default_arg.patch
+patch -p0 < 00_PATCH_mkLit_default_arg.patch
+patch -p0 < 00_PATCH_remove_zlib.patch
diff --git a/libs/minisat/ParseUtils.h b/libs/minisat/ParseUtils.h
index 1c9e7bf7..04911c70 100644
--- a/libs/minisat/ParseUtils.h
+++ b/libs/minisat/ParseUtils.h
@@ -24,8 +24,6 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
#include <stdlib.h>
#include <stdio.h>
-#include <zlib.h>
-
#include "XAlloc.h"
namespace Minisat {
@@ -36,24 +34,16 @@ namespace Minisat {
class StreamBuffer {
- gzFile in;
unsigned char* buf;
int pos;
int size;
enum { buffer_size = 64*1024 };
- void assureLookahead() {
- if (pos >= size) {
- pos = 0;
- size = gzread(in, buf, buffer_size); } }
+ virtual void assureLookahead() = 0;
public:
- explicit StreamBuffer(gzFile i) : in(i), pos(0), size(0){
- buf = (unsigned char*)xrealloc(NULL, buffer_size);
- assureLookahead();
- }
- ~StreamBuffer() { free(buf); }
+ virtual ~StreamBuffer() { }
int operator * () const { return (pos >= size) ? EOF : buf[pos]; }
void operator ++ () { pos++; assureLookahead(); }