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

fix compilation for or-parallelism

Browse Source
This commit is contained in:
Ricardo Rocha 2011-11-30 15:19:37 +00:00
parent 829f207307
commit 7aa77faf2a
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
configure vendored
View File

@ -4909,7 +4909,7 @@ _ACEOF
if test "$or-parallelism" = no if test "$orparallelism" = no
then then
$as_echo "#define MAX_WORKERS 1" >>confdefs.h $as_echo "#define MAX_WORKERS 1" >>confdefs.h
@ -4918,6 +4918,11 @@ else
#define MAX_WORKERS $yap_cv_max_workers #define MAX_WORKERS $yap_cv_max_workers
_ACEOF _ACEOF
if test "$orparallelism" = copy
then
use_malloc="no"
fi
tabling="no"
fi fi
if test "$threads" = no if test "$threads" = no
@ -10771,8 +10776,8 @@ esac
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
# Files that config.status was made for. # Files that config.status was made for.
config_files="$ac_config_files" config_files="`echo $ac_config_files`"
config_headers="$ac_config_headers" config_headers="`echo $ac_config_headers`"
_ACEOF _ACEOF

7
configure.in
View File

@ -441,11 +441,16 @@ AC_SUBST(DefHeapSpace)
AC_SUBST(DefStackSpace) AC_SUBST(DefStackSpace)
AC_SUBST(DefTrailSpace) AC_SUBST(DefTrailSpace)
if test "$or-parallelism" = no if test "$orparallelism" = no
then then
AC_DEFINE(MAX_WORKERS,1) AC_DEFINE(MAX_WORKERS,1)
else else
AC_DEFINE_UNQUOTED(MAX_WORKERS,$yap_cv_max_workers) AC_DEFINE_UNQUOTED(MAX_WORKERS,$yap_cv_max_workers)
if test "$orparallelism" = copy
then
use_malloc="no"
fi
tabling="no"
fi fi
if test "$threads" = no if test "$threads" = no

2
include/YapRegs.h
View File

@ -21,7 +21,7 @@ typedef struct trail_frame {
#else #else
typedef Term *tr_fr_ptr; typedef Term *tr_fr_ptr;
#define TrailTerm(X) ((X)->term) #define TrailTerm(X) (*(CELL*)(X))
#endif #endif
typedef void *choiceptr; typedef void *choiceptr;