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

Merge pull request #11 from edmcman/master

Browse Source 
Fix compilation errors
This commit is contained in:
vscosta 2016-02-18 13:32:43 +00:00
commit a5e99e09bd
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CXX/yapi.cpp
View File

@ -676,7 +676,7 @@ YAPPrologPredicate::YAPPrologPredicate(YAPAtom name,
YAPModule mod, YAPModule mod,
bool tabled, bool tabled,
bool logical_updates, bool logical_updates,
bool thread_local, bool is_thread_local,
bool sourced, bool sourced,
bool discontiguous, bool discontiguous,
bool multiFile, bool multiFile,
@ -689,7 +689,7 @@ YAPPrologPredicate::YAPPrologPredicate(YAPAtom name,
size_t mega_clause size_t mega_clause
) : YAPPredicate(name, arity, mod) { ) : YAPPredicate(name, arity, mod) {
if (!ap) return; if (!ap) return;
if (thread_local) { if (is_thread_local) {
if (ap->cs.p_code.NOfClauses || tabled) if (ap->cs.p_code.NOfClauses || tabled)
return; return;
ap->PredFlags |= (ThreadLocalPredFlag|LogUpdatePredFlag); ap->PredFlags |= (ThreadLocalPredFlag|LogUpdatePredFlag);

7
packages/myddas/odbc/CMakeLists.txt
View File

@ -21,9 +21,6 @@ add_definitions (-DMYDDAS_ODBC=1)
add_library (Yapodbc SHARED ${YAPODBC_SOURCES}) add_library (Yapodbc SHARED ${YAPODBC_SOURCES})
target_link_libraries(Yapodbc libYap ${ODBC_LIBRARIES}) target_link_libraries(Yapodbc libYap ${ODBC_LIBRARIES})
include_directories (${ODBC_INCLUDE_DIRECTORIES} ..) include_directories (${ODBC_INCLUDE_DIRECTORIES} ..)
else()
add_definitions (-DMYDDAS_ODBC=0)
endif (ODBC_FOUND)
set_target_properties (Yapodbc PROPERTIES set_target_properties (Yapodbc PROPERTIES
POSITION_INDEPENDENT_CODE ON POSITION_INDEPENDENT_CODE ON
@ -31,9 +28,11 @@ set_target_properties (Yapodbc PROPERTIES
SOVERSION ${SO_MAJOR} SOVERSION ${SO_MAJOR}
) )
install(TARGETS Yapodbc install(TARGETS Yapodbc
LIBRARY DESTINATION ${libdir} LIBRARY DESTINATION ${libdir}
ARCHIVE DESTINATION ${libdir} ARCHIVE DESTINATION ${libdir}
) )
else()
add_definitions (-DMYDDAS_ODBC=0)
endif (ODBC_FOUND)