From efe6c4eaef07d6f771e951182206bd0a515fa563 Mon Sep 17 00:00:00 2001
From: vsc <vsc@b08c6af1-5177-4d33-ba66-4b1c6b8b522a>
Date: Tue, 12 Feb 2008 21:50:58 +0000
Subject: [PATCH] condor support.

git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@2092 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
---
 C/sysbits.c               | 7 ++++---
 CLPBN/clpbn/bnt.yap       | 1 +
 H/Yap.h                   | 4 ++--
 library/yap2swi/yap2swi.c | 4 ++++
 pl/statistics.yap         | 1 -
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/C/sysbits.c b/C/sysbits.c
index 9379d687a..9c2aeab2d 100644
--- a/C/sysbits.c
+++ b/C/sysbits.c
@@ -302,6 +302,7 @@ bla bla
 #if THREADS
 #define StartOfTimes (*(ThreadHandle[worker_id].start_of_timesp))
 #define last_time    (*(ThreadHandle[worker_id].last_timep))
+
 #else
 /* since the point YAP was started */
 static struct timeval StartOfTimes;
@@ -2343,7 +2344,7 @@ p_alarm(void)
     tout = MkIntegerTerm(0);
     return Yap_unify(ARG3,tout) && Yap_unify(ARG4,MkIntTerm(0));
   }
-#elif HAVE_SETITIMER
+#elif HAVE_SETITIMER && !SUPPORT_CONDOR
   {
     struct itimerval new, old;
 
@@ -2362,7 +2363,7 @@ p_alarm(void)
     return Yap_unify(ARG3,MkIntegerTerm(old.it_value.tv_sec)) &&
       Yap_unify(ARG4,MkIntegerTerm(old.it_value.tv_usec));
   }
-#elif HAVE_ALARM
+#elif HAVE_ALARM && !SUPPORT_CONDOR
   {
     Int left;
     Term tout;
@@ -2835,7 +2836,7 @@ rw_lock_voodoo(void) {
 #endif /* sparc */
 
 
-#ifdef i386
+#if defined(i386) || defined(__x86_64__)
 asm(
 
 ".align	4\n"
diff --git a/CLPBN/clpbn/bnt.yap b/CLPBN/clpbn/bnt.yap
index 12f5538e7..fc0b19d0e 100644
--- a/CLPBN/clpbn/bnt.yap
+++ b/CLPBN/clpbn/bnt.yap
@@ -68,6 +68,7 @@ bnt_path('$HOME/Yap/CLPBN/FullBNT-1.0.4/BNT').
 %
 %bnt_model(propositional).
 bnt_model(tied).
+%bnt_model(dbn).
 
 /*****************************************
 
diff --git a/H/Yap.h b/H/Yap.h
index ae65c9c44..4ead7b25c 100644
--- a/H/Yap.h
+++ b/H/Yap.h
@@ -10,7 +10,7 @@
 * File:		Yap.h.m4						 *
 * mods:									 *
 * comments:	main header file for YAP				 *
-* version:      $Id: Yap.h,v 1.26 2008-02-07 23:09:13 vsc Exp $	 *
+* version:      $Id: Yap.h,v 1.27 2008-02-12 21:50:58 vsc Exp $	 *
 *************************************************************************/
 
 #include "config.h"
@@ -326,7 +326,7 @@ typedef CELL Term;
 typedef pthread_mutex_t lockvar;
 typedef pthread_rwlock_t rwlock_t;
 #include <pthread_locks.h>
-#elif defined(i386)
+#elif defined(i386) || defined(__x86_64__)
 typedef volatile int lockvar;
 #include <x86_locks.h>
 #elif defined(sparc) || defined(__sparc)
diff --git a/library/yap2swi/yap2swi.c b/library/yap2swi/yap2swi.c
index 11d7ada1e..daaf39978 100644
--- a/library/yap2swi/yap2swi.c
+++ b/library/yap2swi/yap2swi.c
@@ -16,6 +16,10 @@
 
 #include	<SWI-Prolog.h>
 
+#ifdef USE_GMP
+#include <gmp.h>
+#endif
+
 #define BUF_SIZE 256
 #define TMP_BUF_SIZE 2*BUF_SIZE
 #define BUF_RINGS 16
diff --git a/pl/statistics.yap b/pl/statistics.yap
index 52c477d81..eeb70edb3 100644
--- a/pl/statistics.yap
+++ b/pl/statistics.yap
@@ -132,7 +132,6 @@ key_statistics(Key, NOfEntries, TotalSize) :-
 %	Based on the SWI-Prolog definition minus reporting the number of inferences,
 %	which YAP does not currently supports
 
-
 :- meta_predicate time(:).
 
 time(Goal) :-