Merge branch 'master' of git@gitorious.org:yap-git/mainline
This commit is contained in:
commit
e73b3e1a6b
@ -2652,7 +2652,6 @@ new_lu_int_key(Int key)
|
|||||||
p->ArityOfPE = 3;
|
p->ArityOfPE = 3;
|
||||||
p->OpcodeOfPred = Yap_opcode(_op_fail);
|
p->OpcodeOfPred = Yap_opcode(_op_fail);
|
||||||
p->cs.p_code.TrueCodeOfPred = p->CodeOfPred = FAILCODE;
|
p->cs.p_code.TrueCodeOfPred = p->CodeOfPred = FAILCODE;
|
||||||
WRITE_UNLOCK(ae->ARWLock);
|
|
||||||
INT_LU_KEYS[hash_key] = p0;
|
INT_LU_KEYS[hash_key] = p0;
|
||||||
return p;
|
return p;
|
||||||
}
|
}
|
||||||
|
@ -1990,6 +1990,10 @@ AddAtomToHash(CELL *st, Atom at)
|
|||||||
} else {
|
} else {
|
||||||
char *c = RepAtom(at)->StrOfAE;
|
char *c = RepAtom(at)->StrOfAE;
|
||||||
int ulen = strlen(c);
|
int ulen = strlen(c);
|
||||||
|
/* fix hashing over empty atom */
|
||||||
|
if (!ulen) {
|
||||||
|
return st;
|
||||||
|
}
|
||||||
start = (CELL *)c;
|
start = (CELL *)c;
|
||||||
if (ulen % CellSize == 0) {
|
if (ulen % CellSize == 0) {
|
||||||
len = ulen/CellSize;
|
len = ulen/CellSize;
|
||||||
|
2
H/Yap.h
2
H/Yap.h
@ -145,8 +145,10 @@
|
|||||||
|
|
||||||
#ifdef THREADS
|
#ifdef THREADS
|
||||||
#if USE_PTHREAD_LOCKING
|
#if USE_PTHREAD_LOCKING
|
||||||
|
#ifndef _XOPEN_SOURCE
|
||||||
#define _XOPEN_SOURCE 600
|
#define _XOPEN_SOURCE 600
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
#include <pthread.h>
|
#include <pthread.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit 0072deb511e839a2f2df6bfa170076f9c8ecb6bb
|
Subproject commit e3ee70d5971a5af8c9a2a3a5fe8a1892c3777f2b
|
@ -1 +1 @@
|
|||||||
Subproject commit 8192d5f9ba0bba55fdd96b4473d68d8cf57f51aa
|
Subproject commit d661852f76fe24441d983ef6f4e60ba90cfe17c4
|
Reference in New Issue
Block a user