Merge branch 'master' of ssh://git.dcc.fc.up.pt/yap-6.3
This commit is contained in:
commit
519d22f5ad
@ -867,7 +867,7 @@ install_win32: startup.yss @ENABLE_WINCONSOLE@ yap-win@EXEC_SUFFIX@
|
||||
@ENABLE_RDF@ (cd packages/RDF; $(MAKE) install)
|
||||
@ENABLE_SEMWEB@ (cd packages/semweb; $(MAKE) install)
|
||||
@ENABLE_SGML@ (cd packages/sgml; $(MAKE) install)
|
||||
@ENABLE_ZLIB@ (cd packages/zlib; $(MAKE) @ZLIB_INSTALL@)
|
||||
@ENABLE_ZLIB@ (cd packages/zlib; $(MAKE) install)
|
||||
(cd packages/CLPBN ; $(MAKE) install)
|
||||
@ENABLE_CLPBN_BP@ (cd packages/CLPBN/horus; $(MAKE) install)
|
||||
@ENABLE_JPL@ (cd packages/jpl ; $(MAKE) install)
|
||||
|
15
configure.in
15
configure.in
@ -1821,12 +1821,22 @@ then
|
||||
|
||||
m4_include([packages/archive/configure.in])
|
||||
|
||||
if test "$ARCHIVE_TARGETS" = "nolib"
|
||||
then
|
||||
ENABLE_LIBARCHIVE="@# "
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
if test "$ENABLE_ODBC" = ""; then
|
||||
|
||||
m4_include([packages/odbc/configure.in])
|
||||
|
||||
if test "$ODBC_TARGETS" = "nolib"
|
||||
then
|
||||
ENABLE_ODBC="@# "
|
||||
fi
|
||||
|
||||
else
|
||||
ODBC_TARGETS=nolib
|
||||
ODBC_PLTARGETS=odbc.pl
|
||||
@ -1841,6 +1851,11 @@ then
|
||||
|
||||
m4_include([packages/zlib/configure.in])
|
||||
|
||||
if test "$ZLIB_TARGETS" = "nolib"
|
||||
then
|
||||
ENABLE_ZLIB="@# "
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
m4_include([packages/gecode/configure.in])
|
||||
|
@ -30,6 +30,9 @@
|
||||
#if HAVE_ERRNO_H
|
||||
#include <errno.h>
|
||||
#endif
|
||||
#if HAVE_SIGNAL_H
|
||||
#include <signal.h>
|
||||
#endif
|
||||
|
||||
#define PL_KERNEL 1
|
||||
|
||||
@ -2479,6 +2482,8 @@ X_API int PL_thread_self(void)
|
||||
#endif
|
||||
}
|
||||
|
||||
#if THREADS
|
||||
|
||||
static int
|
||||
alertThread(int tid)
|
||||
{
|
||||
@ -2512,7 +2517,7 @@ PL_thread_raise(int tid, int sig)
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
X_API int PL_unify_thread_id(term_t t, int i)
|
||||
{
|
||||
|
@ -222,6 +222,7 @@ cuda_load_fact( void ) {
|
||||
} else {
|
||||
currentFact = i;
|
||||
}
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static int
|
||||
|
Reference in New Issue
Block a user