From 0f58cf80298f9aae86f93907e399fbb8a04d596a Mon Sep 17 00:00:00 2001
From: Vitor Santos Costa <vsc@dcc.fc.up.pt>
Date: Mon, 16 Feb 2009 12:53:29 +0000
Subject: [PATCH] small fixes

---
 C/clause_list.c       | 2 ++
 GIT                   | 1 -
 Makefile.in           | 6 ++----
 include/clause_list.h | 5 +++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/C/clause_list.c b/C/clause_list.c
index 348151df6..0669a2cc4 100644
--- a/C/clause_list.c
+++ b/C/clause_list.c
@@ -2,6 +2,8 @@
 #include "clause.h"
 #include "clause_list.h"
 
+/* need to fix overflow handling */
+
 static void
 mk_blob(int sz)
 {
diff --git a/GIT b/GIT
index 31f953e72..e57e3456f 100644
--- a/GIT
+++ b/GIT
@@ -13,7 +13,6 @@ git clone git://gitorious.org/yap-git/mainline.git yap
 cd yap
 git branch --track devel origin/devel 
 git checkout devel
-# git submodule add vsc@software.imdea.org:/srv/git/research/prolog-commons.git prolog-commons
 git submodule add git://prolog.cs.vu.nl/home/pl/git/chr.git packages/chr
 ./configure
 
diff --git a/Makefile.in b/Makefile.in
index 5950e769c..0a870c84f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -57,7 +57,7 @@ YAP_EXTRAS=@YAP_EXTRAS@
 #
 CC=@CC@
 MPI_CC=@MPI_CC@
-CPPFLAGS=@CPPFLAGS@  -I. -I$(srcdir)/H -I$(srcdir)/OPTYap -I$(srcdir)/packages/BEAM -I$(srcdir)/MYDDAS
+CPPFLAGS=@CPPFLAGS@  -I. -I$(srcdir)/H -I$(srcdir)/OPTYap -I$(srcdir)/BEAM -I$(srcdir)/packages/MYDDAS
 CFLAGS= @CFLAGS@ $(YAP_EXTRAS) $(DEFS) $(CPPFLAGS)
 C_INTERF_FLAGS= @C_INTERF_FLAGS@ $(YAP_EXTRAS) $(DEFS) $(CPPFLAGS) -I$(srcdir)/include
 C_PARSER_FLAGS= @C_PARSER_FLAGS@ $(YAP_EXTRAS) $(DEFS) $(CPPFLAGS)
@@ -630,8 +630,6 @@ install_unix: startup libYap.a
 	@INSTALL_DLLS@ $(INSTALL_DATA) -m 755 @YAPLIB@ $(DESTDIR)$(LIBDIR)
 	mkdir -p $(DESTDIR)$(SHAREDIR)/Yap
 	mkdir -p $(DESTDIR)$(SHAREDIR)/Yap/pl
-	mkdir -p $(DESTDIR)$(SHAREDIR)/Yap/swi
-	mkdir -p $(DESTDIR)$(SHAREDIR)/PrologCommons
 	for f in $(PL_SOURCES); do $(INSTALL) $$f $(DESTDIR)$(SHAREDIR)/Yap/pl; done
 	@INSTALL_DLLS@ (cd library/random; $(MAKE) install)
 	@INSTALL_DLLS@ (cd library/regex; $(MAKE) install)
@@ -716,7 +714,7 @@ clean: clean_docs
 	@INSTALL_DLLS@ (cd library/lammpi; $(MAKE) clean)
 	@INSTALL_MATLAB@ (cd library/matlab; $(MAKE) clean)
 	@ENABLE_JPL@ @INSTALL_DLLS@ (cd LGPL/JPL/src; $(MAKE) clean)
-	@ENABLE_CPLINT@ (cd cplint; $(MAKE) clean)
+	@ENABLE_CPLINT@ (cd packages/cplint; $(MAKE) clean)
 
 
 
diff --git a/include/clause_list.h b/include/clause_list.h
index b3b013f4d..a7efe29f4 100644
--- a/include/clause_list.h
+++ b/include/clause_list.h
@@ -23,5 +23,6 @@ X_API void         *Yap_ClauseListToClause(clause_list_t cl);
 X_API void         *Yap_ClauseListCode(clause_list_t cl);
 X_API void         *Yap_FAILCODE(void);
 
-#define ClauseListCount(cl) cl->n
-#define ClauseList(cl) cl->start
+#define Yap_ClauseListCount(cl) ((cl)->n)
+
+