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

fix conflict with WIN library

Browse Source
This commit is contained in:
U-WIN-U2045GN0RNQ\Vítor Santos Costa 2011-10-21 19:12:21 +01:00
parent aa55e73002
commit f7f90d5f5c
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
C/qlyr.c
View File

@ -60,7 +60,7 @@ Yap_AlwaysAllocCodeSpace(UInt size)
} }
static void static void
ERROR(qlfr_err_t my_err) QLYR_ERROR(qlfr_err_t my_err)
{ {
fprintf(stderr,"Error %d\n", my_err); fprintf(stderr,"Error %d\n", my_err);
exit(1); exit(1);
@ -80,7 +80,7 @@ LookupAtom(Atom oat)
} }
a = a->next; a = a->next;
} }
ERROR(UNKNOWN_ATOM); QLYR_ERROR(UNKNOWN_ATOM);
return NIL; return NIL;
} }
@ -122,7 +122,7 @@ LookupFunctor(Functor ofun)
} }
f = f->next; f = f->next;
} }
ERROR(UNKNOWN_FUNCTOR); QLYR_ERROR(UNKNOWN_FUNCTOR);
return NIL; return NIL;
} }
@ -164,7 +164,7 @@ LookupPredEntry(PredEntry *op)
} }
p = p->next; p = p->next;
} }
ERROR(UNKNOWN_PRED_ENTRY); QLYR_ERROR(UNKNOWN_PRED_ENTRY);
return NIL; return NIL;
} }
@ -206,7 +206,7 @@ LookupOPCODE(OPCODE op)
} }
f = f->next; f = f->next;
} }
ERROR(UNKNOWN_OPCODE); QLYR_ERROR(UNKNOWN_OPCODE);
return NIL; return NIL;
} }
@ -224,7 +224,7 @@ OpcodeID(OPCODE op)
} }
f = f->next; f = f->next;
} }
ERROR(UNKNOWN_OPCODE); QLYR_ERROR(UNKNOWN_OPCODE);
return NIL; return NIL;
} }
@ -267,7 +267,7 @@ LookupDBRef(DBRef dbr)
} }
p = p->next; p = p->next;
} }
ERROR(UNKNOWN_DBREF); QLYR_ERROR(UNKNOWN_DBREF);
return NIL; return NIL;
} }
@ -702,29 +702,29 @@ ReadHash(IOSTREAM *stream)
UInt len; UInt len;
len = read_uint(stream); len = read_uint(stream);
if (!EnoughTempSpace(len)) ERROR(OUT_OF_TEMP_SPACE); if (!EnoughTempSpace(len)) QLYR_ERROR(OUT_OF_TEMP_SPACE);
read_bytes(stream, rep, (len+1)*sizeof(wchar_t)); read_bytes(stream, rep, (len+1)*sizeof(wchar_t));
while (!(at = Yap_LookupWideAtom(rep))) { while (!(at = Yap_LookupWideAtom(rep))) {
if (!Yap_growheap(FALSE, 0, NULL)) { if (!Yap_growheap(FALSE, 0, NULL)) {
exit(1); exit(1);
} }
} }
if (at == NIL) ERROR(OUT_OF_ATOM_SPACE); if (at == NIL) QLYR_ERROR(OUT_OF_ATOM_SPACE);
} else if (tg == QLY_ATOM) { } else if (tg == QLY_ATOM) {
char *rep = (char *)AllocTempSpace(); char *rep = (char *)AllocTempSpace();
UInt len; UInt len;
len = read_uint(stream); len = read_uint(stream);
if (!EnoughTempSpace(len)) ERROR(OUT_OF_TEMP_SPACE); if (!EnoughTempSpace(len)) QLYR_ERROR(OUT_OF_TEMP_SPACE);
read_bytes(stream, rep, (len+1)*sizeof(char)); read_bytes(stream, rep, (len+1)*sizeof(char));
while (!(at = Yap_FullLookupAtom(rep))) { while (!(at = Yap_FullLookupAtom(rep))) {
if (!Yap_growheap(FALSE, 0, NULL)) { if (!Yap_growheap(FALSE, 0, NULL)) {
exit(1); exit(1);
} }
} }
if (at == NIL) ERROR(OUT_OF_ATOM_SPACE); if (at == NIL) QLYR_ERROR(OUT_OF_ATOM_SPACE);
} else { } else {
ERROR(BAD_ATOM); QLYR_ERROR(BAD_ATOM);
return; return;
} }
InsertAtom(oat, at); InsertAtom(oat, at);
@ -884,7 +884,7 @@ read_clauses(IOSTREAM *stream, PredEntry *pp, UInt nclauses, UInt flags) {
if (pp->PredFlags & SYSTEM_PRED_FLAGS) { if (pp->PredFlags & SYSTEM_PRED_FLAGS) {
if (nclauses) { if (nclauses) {
ERROR(INCONSISTENT_CPRED); QLYR_ERROR(INCONSISTENT_CPRED);
} }
return; return;
} }

2
H/qly.h
View File

@ -111,7 +111,7 @@ typedef enum {
#define NEXTOP(V,TYPE) ((yamop *)(&((V)->u.TYPE.next))) #define NEXTOP(V,TYPE) ((yamop *)(&((V)->u.TYPE.next)))
#define CHECK(F) { size_t r = (F); if (!r) return r; } #define CHECK(F) { size_t r = (F); if (!r) return r; }
#define RCHECK(F) if(!(F)) { ERROR(MISMATCH); return; } #define RCHECK(F) if(!(F)) { QLYR_ERROR(MISMATCH); return; }
#define AllocTempSpace() (H) #define AllocTempSpace() (H)
#define EnoughTempSpace(sz) ((ASP-H)*sizeof(CELL) > sz) #define EnoughTempSpace(sz) ((ASP-H)*sizeof(CELL) > sz)