From a1b58f61e0fc5c014b6e0f3686a3af1c0af64706 Mon Sep 17 00:00:00 2001
From: Vitor Santos Costa <vsc@dcc.fc.up.pt>
Date: Fri, 13 Mar 2009 12:06:57 +0000
Subject: [PATCH] conditional compilation of thread inlines

---
 H/Atoms.h | 5 +++++
 H/Heap.h  | 6 ++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/H/Atoms.h b/H/Atoms.h
index 5b74d06d7..0631be0a3 100644
--- a/H/Atoms.h
+++ b/H/Atoms.h
@@ -15,6 +15,9 @@
 *									 *
 *************************************************************************/
 
+#ifndef ATOMS_H
+#define ATOMS_H 1
+
 #undef EXTERN
 #ifndef ADTDEFS_C
 #define EXTERN  static
@@ -114,3 +117,5 @@ typedef struct FunctorEntryStruct
 } FunctorEntry;
 
 typedef FunctorEntry *Functor;
+
+#endif /* ATOMS_H */
diff --git a/H/Heap.h b/H/Heap.h
index ab204a4c2..7264d74b9 100644
--- a/H/Heap.h
+++ b/H/Heap.h
@@ -811,12 +811,13 @@ Yap_PreAllocCodeSpace(void)
   return Yap_InitPreAllocCodeSpace();
 }
 
+#ifdef ATOMS_H
 #ifdef THREADS
-Prop STD_PROTO(Yap_NewThreadPred, (PredEntry *));
+Prop STD_PROTO(Yap_NewThreadPred, (struct pred_entry *));
 Prop STD_PROTO(Yap_NewPredPropByFunctor, (Functor, Term));
 
 EXTERN inline PredEntry *
-Yap_GetThreadPred(PredEntry *ap)
+Yap_GetThreadPred(struct pred_entry *ap)
 {
   Functor f = ap->FunctorOfPred;
   Term  mod = ap->ModuleOfPred;
@@ -831,5 +832,6 @@ Yap_GetThreadPred(PredEntry *ap)
   return RepPredProp(Yap_NewThreadPred(ap));
 }
 #endif
+#endif
 
 #endif /* HEAP_H */