diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

X_API WIN32 stuff

Browse Source
This commit is contained in:
Vítor Santos Costa 2016-01-31 10:29:36 +00:00
parent 35eb33e27f
commit 9c78086a6a
4 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
H/Yap.h
View File

@ -590,12 +590,13 @@ typedef enum
#else #else
#define YAPEnterCriticalSection() \ #define YAPEnterCriticalSection() \
{ \ { \
LOCAL_PrologMode |= CritMode; \ LOCAL_PrologMode |= CritMode;/* printf("%d, %s:%d\n",LOCAL_CritLocks+1,__FILE__,__LINE__);*/ \
LOCAL_CritLocks++; \ LOCAL_CritLocks++; \
} }
#define YAPLeaveCriticalSection() \ #define YAPLeaveCriticalSection() \
{ \ { \
LOCAL_CritLocks--; \ LOCAL_CritLocks--; \
/*printf("%d, %s:%d\n",LOCAL_CritLocks,__FILE__,__LINE__);*/ \
if (!LOCAL_CritLocks) { \ if (!LOCAL_CritLocks) { \
LOCAL_PrologMode &= ~CritMode; \ LOCAL_PrologMode &= ~CritMode; \
if (LOCAL_PrologMode & AbortMode) { \ if (LOCAL_PrologMode & AbortMode) { \

9
include/SWI-Prolog.h
View File

@ -69,13 +69,6 @@ typedef int _Bool;
#define __WINDOWS__ 1 #define __WINDOWS__ 1
#endif #endif
#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" #include "pl-types.h"
@ -100,7 +93,7 @@ stuff.
#endif #endif
#ifdef HAVE_DECLSPEC #ifdef HAVE_DECLSPEC
# ifdef PL_KERNEL # ifdef _YAP_NOT_INSTALLED_
#define PL_EXPORT(type) __declspec(dllexport) type #define PL_EXPORT(type) __declspec(dllexport) type
#define PL_EXPORT_DATA(type) __declspec(dllexport) type #define PL_EXPORT_DATA(type) __declspec(dllexport) type
#define install_t void #define install_t void

1
include/c_interface.c Normal file
View File

@ -0,0 +1 @@

20
include/clause_list.h
View File

@ -1,10 +1,4 @@
#if defined(_MSC_VER) && defined(YAP_EXPORTS)
#define X_API __declspec(dllexport)
#else
#define X_API
#endif
struct ClauseList struct ClauseList
{ {
@ -14,14 +8,14 @@ struct ClauseList
}; };
typedef struct ClauseList *clause_list_t; 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); int Yap_ClauseListExtend(clause_list_t cl, void * clause, void *pred);
X_API void Yap_ClauseListClose(clause_list_t cl); void Yap_ClauseListClose(clause_list_t cl);
X_API int Yap_ClauseListDestroy(clause_list_t cl); int Yap_ClauseListDestroy(clause_list_t cl);
X_API void *Yap_ClauseListToClause(clause_list_t cl); void *Yap_ClauseListToClause(clause_list_t cl);
X_API void *Yap_ClauseListCode(clause_list_t cl); void *Yap_ClauseListCode(clause_list_t cl);
X_API void *Yap_FAILCODE(void); void *Yap_FAILCODE(void);
#define Yap_ClauseListCount(cl) ((cl)->n) #define Yap_ClauseListCount(cl) ((cl)->n)