fix tyes.

include/YapDefs.h

@@ -20,12 +20,23 @@
 
 #include <stdlib.h>
 
+#ifdef YAP_H
+
 /* The YAP main types */
 #include "YapTerm.h"
 
+#else
+
+#include "config.h"
+
+#endif /* YAP_H */
+
 /* truth-values */
 /* stdbool defines the booleam type, bool,
    and the constants false and true */
+#if HAVE_STDINT_H
+#include <stdint.h>
+#endif
 #if HAVE_STDBOOL_H
 #include <stdbool.h>
 #else
@@ -49,6 +60,9 @@ typedef int _Bool;
 #ifndef FALSE
 #define	 FALSE	false
 #endif
+#ifndef YAP_Bool
+typedef bool YAP_Bool;
+#endif
 
 #ifdef YAP_H
 
@@ -72,8 +86,6 @@ typedef int _Bool;
 
 #define YAP_Float Float
 
-#define YAP_Bool bool
-
 #define YAP_handle_t  yhandle_t
 
 #define YAP_PredEntryPtr struct pred_entry *
@@ -92,8 +104,6 @@ typedef unsigned long long YAP_CELL;
 typedef uintptr_t YAP_CELL;  
 #endif
 
-typedef bool YAP_Bool;
-
 typedef YAP_CELL YAP_Term;
 
 typedef YAP_CELL YAP_Arity;
@@ -136,7 +146,6 @@ typedef int  (*YAP_agc_hook)(void *_Atom);
 
 #endif
 
-
 typedef struct YAP_thread_attr_struct {
   size_t		    ssize;
   size_t		    tsize;