From 9c78086a6ab1b86481de5ead691de99e4549ad19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADtor=20Santos=20Costa?= <vsc@dcc.fc.up.pt>
Date: Sun, 31 Jan 2016 10:29:36 +0000
Subject: [PATCH] X_API WIN32  stuff

---
 H/Yap.h               |  3 ++-
 include/SWI-Prolog.h  |  9 +--------
 include/c_interface.c |  1 +
 include/clause_list.h | 20 +++++++-------------
 4 files changed, 11 insertions(+), 22 deletions(-)
 create mode 100644 include/c_interface.c

diff --git a/H/Yap.h b/H/Yap.h
index 58ca4a732..8b4a3d2ce 100755
--- a/H/Yap.h
+++ b/H/Yap.h
@@ -590,12 +590,13 @@ typedef enum
 #else
 #define YAPEnterCriticalSection()                                        \
 	{                                                                \
-          LOCAL_PrologMode |= CritMode;                                   \
+      LOCAL_PrologMode |= CritMode;/* printf("%d, %s:%d\n",LOCAL_CritLocks+1,__FILE__,__LINE__);*/ \
           LOCAL_CritLocks++;                                              \
         }
 #define YAPLeaveCriticalSection()                                        \
 	{                                                                \
           LOCAL_CritLocks--;                                              \
+          /*printf("%d, %s:%d\n",LOCAL_CritLocks,__FILE__,__LINE__);*/  \
           if (!LOCAL_CritLocks) {                                         \
             LOCAL_PrologMode &= ~CritMode;                                \
             if (LOCAL_PrologMode & AbortMode) {                           \
diff --git a/include/SWI-Prolog.h b/include/SWI-Prolog.h
index 8115af8e2..af648dba7 100755
--- a/include/SWI-Prolog.h
+++ b/include/SWI-Prolog.h
@@ -69,13 +69,6 @@ typedef int _Bool;
 #define __WINDOWS__ 1
 #endif
 #endif
-#ifndef X_API
-#if (defined(_MSC_VER) || defined(__MINGW32__)) && defined(PL_KERNEL)
-#define X_API __declspec(dllexport)
-#else
-#define X_API
-#endif
-#endif
 
 
 #include "pl-types.h"
@@ -100,7 +93,7 @@ stuff.
 #endif
 
 #ifdef HAVE_DECLSPEC
-# ifdef PL_KERNEL
+# ifdef _YAP_NOT_INSTALLED_
 #define PL_EXPORT(type)		__declspec(dllexport) type
 #define PL_EXPORT_DATA(type)	__declspec(dllexport) type
 #define install_t	 	void
diff --git a/include/c_interface.c b/include/c_interface.c
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/include/c_interface.c
@@ -0,0 +1 @@
+
diff --git a/include/clause_list.h b/include/clause_list.h
index a7efe29f4..5268911c9 100644
--- a/include/clause_list.h
+++ b/include/clause_list.h
@@ -1,10 +1,4 @@
 
-#if defined(_MSC_VER) && defined(YAP_EXPORTS)
-#define X_API __declspec(dllexport)
-#else
-#define X_API
-#endif
-
 
 struct ClauseList
 {
@@ -14,14 +8,14 @@ struct ClauseList
 };
 typedef struct ClauseList *clause_list_t;
 
-X_API clause_list_t Yap_ClauseListInit(clause_list_t in);
+ clause_list_t Yap_ClauseListInit(clause_list_t in);
 
-X_API int           Yap_ClauseListExtend(clause_list_t cl, void * clause, void *pred);
-X_API void	    Yap_ClauseListClose(clause_list_t cl);
-X_API int	    Yap_ClauseListDestroy(clause_list_t cl);
-X_API void         *Yap_ClauseListToClause(clause_list_t cl);
-X_API void         *Yap_ClauseListCode(clause_list_t cl);
-X_API void         *Yap_FAILCODE(void);
+ int           Yap_ClauseListExtend(clause_list_t cl, void * clause, void *pred);
+ void	    Yap_ClauseListClose(clause_list_t cl);
+ int	    Yap_ClauseListDestroy(clause_list_t cl);
+ void         *Yap_ClauseListToClause(clause_list_t cl);
+ void         *Yap_ClauseListCode(clause_list_t cl);
+ void         *Yap_FAILCODE(void);
 
 #define Yap_ClauseListCount(cl) ((cl)->n)