From 3ccad9aff23af9896857254e4356ffecafb25eff Mon Sep 17 00:00:00 2001
From: Ricardo Rocha <ricroc@hp.(none)>
Date: Wed, 24 Jun 2009 20:00:51 +0100
Subject: [PATCH] redefine MAX_DEPTH as MAX_BRANCH_DEPTH to avoid conflits with
 yap2swi library

---
 OPTYap/opt.config.h   | 2 +-
 OPTYap/opt.structs.h  | 2 +-
 OPTYap/or.cowengine.c | 2 +-
 OPTYap/or.engine.c    | 2 +-
 OPTYap/or.sbaengine.c | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/OPTYap/opt.config.h b/OPTYap/opt.config.h
index e8f44277f..56684d78b 100644
--- a/OPTYap/opt.config.h
+++ b/OPTYap/opt.config.h
@@ -17,7 +17,7 @@
 **      default sizes      **
 ** ----------------------- */
 #define MAX_LENGTH_ANSWER  500
-#define MAX_DEPTH          1000
+#define MAX_BRANCH_DEPTH   1000
 #define MAX_BEST_TIMES     21
 #define MAX_TABLE_VARS     100
 #define TABLE_LOCK_BUCKETS 512
diff --git a/OPTYap/opt.structs.h b/OPTYap/opt.structs.h
index 432272b46..3b4ee4510 100644
--- a/OPTYap/opt.structs.h
+++ b/OPTYap/opt.structs.h
@@ -158,7 +158,7 @@ struct global_data{
   volatile bitmap pruning_workers;
 #endif /* TABLING_INNER_CUTS */
   struct global_locks locks;
-  volatile unsigned int branch[MAX_WORKERS][MAX_DEPTH];
+  volatile unsigned int branch[MAX_WORKERS][MAX_BRANCH_DEPTH];
   volatile char parallel_execution_mode;  /* TRUE / FALSE */
   volatile int answers;
 #endif /* YAPOR */
diff --git a/OPTYap/or.cowengine.c b/OPTYap/or.cowengine.c
index 6dc62e8e4..2d855929e 100644
--- a/OPTYap/or.cowengine.c
+++ b/OPTYap/or.cowengine.c
@@ -204,7 +204,7 @@ void share_private_nodes(int worker_q) {
     OrFr_nearest_livenode(previous_or_frame) = OrFr_next(previous_or_frame) = or_frame;
   }
   /* update depth */
-  if (depth >= MAX_DEPTH)
+  if (depth >= MAX_BRANCH_DEPTH)
     Yap_Error(INTERNAL_ERROR, TermNil, "maximum depth exceded (share_private_nodes)");
   or_frame = B->cp_or_fr;
   while (or_frame != LOCAL_top_or_fr) {
diff --git a/OPTYap/or.engine.c b/OPTYap/or.engine.c
index e867b7e82..648df1acc 100644
--- a/OPTYap/or.engine.c
+++ b/OPTYap/or.engine.c
@@ -587,7 +587,7 @@ void share_private_nodes(int worker_q) {
 #endif /* TABLING */
 
     /* update depth */
-    if (depth >= MAX_DEPTH)
+    if (depth >= MAX_BRANCH_DEPTH)
       Yap_Error(INTERNAL_ERROR, TermNil, "maximum depth exceded (share_private_nodes)");
     or_frame = B->cp_or_fr;
 #ifdef TABLING
diff --git a/OPTYap/or.sbaengine.c b/OPTYap/or.sbaengine.c
index c4055d2d0..46341e6f8 100644
--- a/OPTYap/or.sbaengine.c
+++ b/OPTYap/or.sbaengine.c
@@ -269,7 +269,7 @@ void share_private_nodes(int worker_q) {
     OrFr_nearest_livenode(previous_or_frame) = OrFr_next(previous_or_frame) = or_frame;
   }
   /* update depth */
-  if (depth >= MAX_DEPTH)
+  if (depth >= MAX_BRANCH_DEPTH)
     Yap_Error(INTERNAL_ERROR, TermNil, "maximum depth exceded (share_private_nodes)");
   or_frame = B->cp_or_fr;