Merge branch 'master' of ssh://yap.git.sourceforge.net/gitroot/yap/yap-6.3

Conflicts: C/cdmgr.c
2011-05-04 11:10:20 +01:00
parent 1358d7037a bf6033082d
commit d9cee607e9
42 changed files with 5223 additions and 26 deletions
--- a/packages/PLStream/pl-dtoa.c
+++ b/packages/PLStream/pl-dtoa.c
@@ -30,7 +30,7 @@
 #define MALLOC PL_malloc
 #define FREE PL_free

-#if defined(_REENTRANT)||defined(__YAP_PROLOG__)
+#if defined(_REENTRANT)
 #define Long int			/* 32-bits */
 #define MULTIPLE_THREADS

@@ -56,6 +56,8 @@ FREE_DTOA_LOCK(int n)
    pthread_mutex_unlock(&mutex_1);
 }

+#elif defined(__YAP_PROLOG__)
+#define Long int			/* 32-bits */
 #endif /*MULTIPLE_THREADS*/

 #include "dtoa.c"