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

Merge ../../yap-6.3

Browse Source
This commit is contained in:
Vitor Santos Costa 2018-02-24 14:49:43 +00:00
commit a073b663ae
9 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
C/blobs.c
View File

@ -17,7 +17,7 @@
/* for freeBSD9.1 */ /* for freeBSD9.1 */
#define _WITH_DPRINTF #define _WITH_DPRINTF
#include "blobs.h" #include "YapBlobs.h"
static blob_type_t unregistered_blob_atom = { static blob_type_t unregistered_blob_atom = {
YAP_BLOB_MAGIC_B, PL_BLOB_NOCOPY | PL_BLOB_TEXT, "unregistered"}; YAP_BLOB_MAGIC_B, PL_BLOB_NOCOPY | PL_BLOB_TEXT, "unregistered"};

2
C/threads.c
View File

@ -28,7 +28,7 @@ static char SccsId[] = "%W% %G%";
#include "YapHeap.h" #include "YapHeap.h"
#include "YapEval.h" #include "YapEval.h"
#include "yapio.h" #include "yapio.h"
#include "blobs.h" #include "YapBlobs.h"
#include <stdio.h> #include <stdio.h>
#if HAVE_UNISTD_H #if HAVE_UNISTD_H
#include <unistd.h> #include <unistd.h>

5
CMakeLists.txt
View File

@ -686,8 +686,11 @@ if (PYTHONLIBS_FOUND AND SWIG_FOUND)
include(FindPythonModule) include(FindPythonModule)
find_python_module(jupyter) find_python_module(jupyter)
find_python_module(wheel)
find_python_module(setuptools)
find_python_module(backcall)
if (PY_JUPYTER) if (PY_JUPYTER AND PY_WHEEL AND PY_SETUPTOOLS AND PY_BACKCALL)
add_subdirectory(packages/python/yap_kernel) add_subdirectory(packages/python/yap_kernel)
ENDIF () ENDIF ()
endif () endif ()

2
CXX/yapi.cpp
View File

@ -11,7 +11,7 @@ extern "C" {
#endif #endif
#include "YapInterface.h" #include "YapInterface.h"
#include "blobs.h" #include "YapBlobs.h"
#include "iopreds.h" #include "iopreds.h"
X_API char *Yap_TermToBuffer(Term t, encoding_t encodingp, int flags); X_API char *Yap_TermToBuffer(Term t, encoding_t encodingp, int flags);

2
H/sshift.h
View File

@ -21,7 +21,7 @@
#define REINIT_LOCK(P) INIT_LOCK(P) #define REINIT_LOCK(P) INIT_LOCK(P)
#define REINIT_RWLOCK(P) INIT_RWLOCK(P) #define REINIT_RWLOCK(P) INIT_RWLOCK(P)
#include <blobs.h> #include <YapBlobs.h>
#define CharP(ptr) ((char *) (ptr)) #define CharP(ptr) ((char *) (ptr))

2
include/SWI-Prolog.h
View File

@ -692,7 +692,7 @@ PL_EXPORT(int) PL_resource_error(const char *resource);
#define PL_set_feature PL_set_prolog_flag /* compatibility */ #define PL_set_feature PL_set_prolog_flag /* compatibility */
PL_EXPORT(int) PL_set_prolog_flag(const char *name, int type, ...); PL_EXPORT(int) PL_set_prolog_flag(const char *name, int type, ...);
#include <blobs.h> #include "YapBlobs.h"
#if USE_GMP && !defined(__cplusplus) #if USE_GMP && !defined(__cplusplus)

0
include/blobs.h → include/YapBlobs.h
View File

1
library/dialect/swi/fli/swi.h
View File

@ -43,6 +43,7 @@
void Yap_swi_install(void); void Yap_swi_install(void);
void Yap_install_blobs(void); void Yap_install_blobs(void);
static inline Term static inline Term
SWIModuleToModule(module_t m) SWIModuleToModule(module_t m)
{ {

4
os/files.c
View File

@ -429,7 +429,11 @@ static Int access_file(USES_REGS1) {
return FALSE; return FALSE;
} }
} else { } else {
<<<<<<< HEAD
return true;
=======
return false; return false;
>>>>>>> f798372fb1dc4ff03c592d2ae8e0245a842305b8
} }
} }
#if HAVE_ACCESS #if HAVE_ACCESS