Index: head/lang/yap/files/patch-H__absmi.h =================================================================== --- head/lang/yap/files/patch-H__absmi.h (nonexistent) +++ head/lang/yap/files/patch-H__absmi.h (revision 332635) @@ -0,0 +1,11 @@ +--- ./H/absmi.h.orig 2013-11-02 21:11:04.000000000 -0200 ++++ ./H/absmi.h 2013-11-02 21:11:12.000000000 -0200 +@@ -74,7 +74,7 @@ + * Use bp as PREG for X86 machines * + ***************************************************************/ + #if defined(IN_ABSMI_C) +-register struct yami* P1REG asm ("bp"); /* can't use yamop before Yap.h */ ++struct yami* P1REG asm ("bp"); /* can't use yamop before Yap.h */ + #define PREG P1REG + #endif + #define NEEDS_TO_SET_PC 1 Property changes on: head/lang/yap/files/patch-H__absmi.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/lang/yap/files/patch-library__dialect__swi__fli__blobs.c =================================================================== --- head/lang/yap/files/patch-library__dialect__swi__fli__blobs.c (revision 332634) +++ head/lang/yap/files/patch-library__dialect__swi__fli__blobs.c (revision 332635) @@ -1,10 +1,10 @@ ---- ./library/dialect/swi/fli/blobs.c.orig 2013-06-28 00:56:12.000000000 -0300 -+++ ./library/dialect/swi/fli/blobs.c 2013-06-28 00:56:27.000000000 -0300 +--- ./library/dialect/swi/fli/blobs.c.orig 2010-12-02 09:47:28.000000000 -0200 ++++ ./library/dialect/swi/fli/blobs.c 2013-11-02 21:10:56.000000000 -0200 @@ -18,6 +18,7 @@ #include #include +#include #include #include Index: head/lang/yap/files/patch-packages__swi-minisat2__C__SolverTypes.h =================================================================== --- head/lang/yap/files/patch-packages__swi-minisat2__C__SolverTypes.h (revision 332634) +++ head/lang/yap/files/patch-packages__swi-minisat2__C__SolverTypes.h (revision 332635) @@ -1,30 +1,30 @@ ---- ./packages/swi-minisat2/C/SolverTypes.h.orig 2013-06-28 00:56:48.000000000 -0300 -+++ ./packages/swi-minisat2/C/SolverTypes.h 2013-06-28 00:57:51.000000000 -0300 +--- ./packages/swi-minisat2/C/SolverTypes.h.orig 2010-10-18 06:48:21.000000000 -0200 ++++ ./packages/swi-minisat2/C/SolverTypes.h 2013-11-02 21:10:56.000000000 -0200 @@ -119,11 +119,7 @@ // -- use this function instead: template - friend Clause* Clause_new(const V& ps, bool learnt = false) { - assert(sizeof(Lit) == sizeof(uint32_t)); - assert(sizeof(float) == sizeof(uint32_t)); - void* mem = malloc(sizeof(Clause) + sizeof(uint32_t)*(ps.size())); - return new (mem) Clause(ps, learnt); } + friend Clause* Clause_new(const V& ps, bool learnt = false); int size () const { return size_etc >> 3; } void shrink (int i) { assert(i <= size()); size_etc = (((size_etc >> 3) - i) << 3) | (size_etc & 7); } @@ -146,6 +142,14 @@ void strengthen (Lit p); }; +template +Clause* Clause_new(const V& ps, bool learnt) { + assert(sizeof(Lit) == sizeof(uint32_t)); + assert(sizeof(float) == sizeof(uint32_t)); + void* mem = malloc(sizeof(Clause) + sizeof(uint32_t)*(ps.size())); + return new (mem) Clause(ps, learnt); +} + /*_________________________________________________________________________________________________ |