From 7ca285eb403e2489d309fac33da1588b634595a7 Mon Sep 17 00:00:00 2001
From: Vitor Santos Costa <vsc@dcc.fc.up.pt>
Date: Tue, 28 Jun 2016 16:40:48 +0100
Subject: [PATCH] YAPStreams

---
 include/YapDefs.h | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/include/YapDefs.h b/include/YapDefs.h
index f423a3d00..07786a5ff 100755
--- a/include/YapDefs.h
+++ b/include/YapDefs.h
@@ -116,7 +116,7 @@ typedef uintptr_t YAP_CELL;
 
 typedef YAP_CELL YAP_Term;
 
-typedef YAP_CELL YAP_Arity;
+typedef size_t YAP_Arity;
 
 typedef YAP_Term YAP_Module;
 
@@ -124,16 +124,9 @@ typedef struct FunctorEntry *YAP_Functor;
 
 typedef struct AtomEntry *YAP_Atom;
 
-#if _WIN64
-typedef long long int YAP_Int;
+typedef intptr_t YAP_Int;
 
-typedef unsigned long long int YAP_UInt;
-
-#else
-typedef long int YAP_Int;
-
-typedef unsigned long int YAP_UInt;
-#endif
+typedef uintptr_t YAP_UInt;
 
 typedef double YAP_Float;
 
@@ -417,7 +410,7 @@ typedef enum yap_enum_reset_t {
   YAP_RESET_FROM_RESTORE = 3
 } yap_reset_t;
 
-typedef void (*YAP_ModInit_t)(void);
+typedef bool (*YAP_ModInit_t)(void);
 
 typedef struct {
   YAP_ModInit_t f;