From: Clifford Wolf <clifford@clifford.at>
Date: Sun, 20 Jul 2014 23:01:26 +0000 (+0200)
Subject: Updated minisat
X-Git-Tag: yosys-0.4~512
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=92c9403249ba59e5f57b2adb8b8b0141c2c63f26;p=yosys.git

Updated minisat
---

diff --git a/libs/minisat/Alg.h b/libs/minisat/Alg.h
index 7f7eac61f..ddb972e77 100644
--- a/libs/minisat/Alg.h
+++ b/libs/minisat/Alg.h
@@ -21,7 +21,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
 #ifndef Minisat_Alg_h
 #define Minisat_Alg_h
 
-#include "libs/minisat/Vec.h"
+#include "Vec.h"
 
 namespace Minisat {
 
diff --git a/libs/minisat/Alloc.h b/libs/minisat/Alloc.h
index 0de4f07ca..6591dcd55 100644
--- a/libs/minisat/Alloc.h
+++ b/libs/minisat/Alloc.h
@@ -21,8 +21,8 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
 #ifndef Minisat_Alloc_h
 #define Minisat_Alloc_h
 
-#include "libs/minisat/XAlloc.h"
-#include "libs/minisat/Vec.h"
+#include "XAlloc.h"
+#include "Vec.h"
 
 namespace Minisat {
 
diff --git a/libs/minisat/Dimacs.h b/libs/minisat/Dimacs.h
index 383e894be..ccfa1c013 100644
--- a/libs/minisat/Dimacs.h
+++ b/libs/minisat/Dimacs.h
@@ -23,8 +23,8 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
 
 #include <stdio.h>
 
-#include "libs/minisat/ParseUtils.h"
-#include "libs/minisat/SolverTypes.h"
+#include "ParseUtils.h"
+#include "SolverTypes.h"
 
 namespace Minisat {
 
diff --git a/libs/minisat/Heap.h b/libs/minisat/Heap.h
index a75124627..057a3cdf2 100644
--- a/libs/minisat/Heap.h
+++ b/libs/minisat/Heap.h
@@ -21,8 +21,8 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
 #ifndef Minisat_Heap_h
 #define Minisat_Heap_h
 
-#include "libs/minisat/Vec.h"
-#include "libs/minisat/IntMap.h"
+#include "Vec.h"
+#include "IntMap.h"
 
 namespace Minisat {
 
diff --git a/libs/minisat/IntMap.h b/libs/minisat/IntMap.h
index 61dd0f679..9a66315d1 100644
--- a/libs/minisat/IntMap.h
+++ b/libs/minisat/IntMap.h
@@ -19,7 +19,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
 #ifndef Minisat_IntMap_h
 #define Minisat_IntMap_h
 
-#include "libs/minisat/Vec.h"
+#include "Vec.h"
 
 namespace Minisat {
 
diff --git a/libs/minisat/Map.h b/libs/minisat/Map.h
index 93b6da31c..a6f832000 100644
--- a/libs/minisat/Map.h
+++ b/libs/minisat/Map.h
@@ -20,8 +20,8 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
 #ifndef Minisat_Map_h
 #define Minisat_Map_h
 
-#include "libs/minisat/IntTypes.h"
-#include "libs/minisat/Vec.h"
+#include "IntTypes.h"
+#include "Vec.h"
 
 namespace Minisat {
 
diff --git a/libs/minisat/Options.cc b/libs/minisat/Options.cc
index b1b3e31ba..1aff3fab2 100644
--- a/libs/minisat/Options.cc
+++ b/libs/minisat/Options.cc
@@ -19,9 +19,9 @@ DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
 OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 **************************************************************************************************/
 
-#include "libs/minisat/Sort.h"
-#include "libs/minisat/Options.h"
-#include "libs/minisat/ParseUtils.h"
+#include "Sort.h"
+#include "Options.h"
+#include "ParseUtils.h"
 
 using namespace Minisat;
 
diff --git a/libs/minisat/Options.h b/libs/minisat/Options.h
index 7d140a1ff..d602769cf 100644
--- a/libs/minisat/Options.h
+++ b/libs/minisat/Options.h
@@ -25,9 +25,9 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
 #include <math.h>
 #include <string.h>
 
-#include "libs/minisat/IntTypes.h"
-#include "libs/minisat/Vec.h"
-#include "libs/minisat/ParseUtils.h"
+#include "IntTypes.h"
+#include "Vec.h"
+#include "ParseUtils.h"
 
 namespace Minisat {
 
diff --git a/libs/minisat/ParseUtils.h b/libs/minisat/ParseUtils.h
index 7b2ddc554..1c9e7bf7b 100644
--- a/libs/minisat/ParseUtils.h
+++ b/libs/minisat/ParseUtils.h
@@ -26,7 +26,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
 
 #include <zlib.h>
 
-#include "libs/minisat/XAlloc.h"
+#include "XAlloc.h"
 
 namespace Minisat {
 
diff --git a/libs/minisat/Queue.h b/libs/minisat/Queue.h
index 1cae4f5ad..5ba50cd2b 100644
--- a/libs/minisat/Queue.h
+++ b/libs/minisat/Queue.h
@@ -21,7 +21,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
 #ifndef Minisat_Queue_h
 #define Minisat_Queue_h
 
-#include "libs/minisat/Vec.h"
+#include "Vec.h"
 
 namespace Minisat {
 
diff --git a/libs/minisat/Rnd.h b/libs/minisat/Rnd.h
index cf7061014..ccb94c6ce 100644
--- a/libs/minisat/Rnd.h
+++ b/libs/minisat/Rnd.h
@@ -19,7 +19,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
 #ifndef Minisat_Rnd_h
 #define Minisat_Rnd_h
 
-#include "libs/minisat/Vec.h"
+#include "Vec.h"
 
 namespace Minisat {
 
diff --git a/libs/minisat/SimpSolver.cc b/libs/minisat/SimpSolver.cc
index 232368106..fd5774e0e 100644
--- a/libs/minisat/SimpSolver.cc
+++ b/libs/minisat/SimpSolver.cc
@@ -20,9 +20,9 @@ DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
 OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 **************************************************************************************************/
 
-#include "libs/minisat/Sort.h"
-#include "libs/minisat/SimpSolver.h"
-#include "libs/minisat/System.h"
+#include "Sort.h"
+#include "SimpSolver.h"
+#include "System.h"
 
 using namespace Minisat;
 
diff --git a/libs/minisat/SimpSolver.h b/libs/minisat/SimpSolver.h
index fc9bb4391..76d5aca1f 100644
--- a/libs/minisat/SimpSolver.h
+++ b/libs/minisat/SimpSolver.h
@@ -21,8 +21,8 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
 #ifndef Minisat_SimpSolver_h
 #define Minisat_SimpSolver_h
 
-#include "libs/minisat/Queue.h"
-#include "libs/minisat/Solver.h"
+#include "Queue.h"
+#include "Solver.h"
 
 
 namespace Minisat {
diff --git a/libs/minisat/Solver.cc b/libs/minisat/Solver.cc
index 14aa39355..ab476853a 100644
--- a/libs/minisat/Solver.cc
+++ b/libs/minisat/Solver.cc
@@ -22,10 +22,10 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
 
 #include <math.h>
 
-#include "libs/minisat/Alg.h"
-#include "libs/minisat/Sort.h"
-#include "libs/minisat/System.h"
-#include "libs/minisat/Solver.h"
+#include "Alg.h"
+#include "Sort.h"
+#include "System.h"
+#include "Solver.h"
 
 using namespace Minisat;
 
diff --git a/libs/minisat/Solver.h b/libs/minisat/Solver.h
index 73fc7d4cf..62a12f3c7 100644
--- a/libs/minisat/Solver.h
+++ b/libs/minisat/Solver.h
@@ -21,12 +21,12 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
 #ifndef Minisat_Solver_h
 #define Minisat_Solver_h
 
-#include "libs/minisat/Vec.h"
-#include "libs/minisat/Heap.h"
-#include "libs/minisat/Alg.h"
-#include "libs/minisat/IntMap.h"
-#include "libs/minisat/Options.h"
-#include "libs/minisat/SolverTypes.h"
+#include "Vec.h"
+#include "Heap.h"
+#include "Alg.h"
+#include "IntMap.h"
+#include "Options.h"
+#include "SolverTypes.h"
 
 
 namespace Minisat {
diff --git a/libs/minisat/SolverTypes.h b/libs/minisat/SolverTypes.h
index a47c2ce83..a7df57858 100644
--- a/libs/minisat/SolverTypes.h
+++ b/libs/minisat/SolverTypes.h
@@ -24,12 +24,12 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
 
 #include <assert.h>
 
-#include "libs/minisat/IntTypes.h"
-#include "libs/minisat/Alg.h"
-#include "libs/minisat/Vec.h"
-#include "libs/minisat/IntMap.h"
-#include "libs/minisat/Map.h"
-#include "libs/minisat/Alloc.h"
+#include "IntTypes.h"
+#include "Alg.h"
+#include "Vec.h"
+#include "IntMap.h"
+#include "Map.h"
+#include "Alloc.h"
 
 namespace Minisat {
 
diff --git a/libs/minisat/Sort.h b/libs/minisat/Sort.h
index 4a25a9b49..cc96486d8 100644
--- a/libs/minisat/Sort.h
+++ b/libs/minisat/Sort.h
@@ -21,7 +21,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
 #ifndef Minisat_Sort_h
 #define Minisat_Sort_h
 
-#include "libs/minisat/Vec.h"
+#include "Vec.h"
 
 //=================================================================================================
 // Some sorting algorithms for vec's
diff --git a/libs/minisat/System.cc b/libs/minisat/System.cc
index df4155af3..febe3b40f 100644
--- a/libs/minisat/System.cc
+++ b/libs/minisat/System.cc
@@ -23,7 +23,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
 #include <signal.h>
 #include <stdio.h>
 
-#include "libs/minisat/System.h"
+#include "System.h"
 
 #if defined(__linux__)
 
diff --git a/libs/minisat/System.h b/libs/minisat/System.h
index eb8a7e4d3..ee92a6e08 100644
--- a/libs/minisat/System.h
+++ b/libs/minisat/System.h
@@ -25,7 +25,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
 #include <fpu_control.h>
 #endif
 
-#include "libs/minisat/IntTypes.h"
+#include "IntTypes.h"
 
 //-------------------------------------------------------------------------------------------------
 
diff --git a/libs/minisat/Vec.h b/libs/minisat/Vec.h
index 2086e0bb2..6e398801f 100644
--- a/libs/minisat/Vec.h
+++ b/libs/minisat/Vec.h
@@ -25,8 +25,8 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
 #include <limits>
 #include <new>
 
-#include "libs/minisat/IntTypes.h"
-#include "libs/minisat/XAlloc.h"
+#include "IntTypes.h"
+#include "XAlloc.h"
 
 namespace Minisat {