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

macro conflict

Browse Source
This commit is contained in:
Vitor Santos Costa 2016-04-22 18:23:22 +01:00
parent b0766abb5c
commit c06d07985e
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
os/format.c
View File

@ -472,7 +472,7 @@ static Int doformat(volatile Term otail, volatile Term oargs,
volatile void *old_handler; volatile void *old_handler;
volatile int old_pos; volatile int old_pos;
format_info finfo; format_info finfo;
unsigned char *bufp = NULL; unsigned char *ubuf = NULL;
Term fmod = CurrentModule; Term fmod = CurrentModule;
size_t sz; size_t sz;
@ -1003,11 +1003,8 @@ static Int doformat(volatile Term otail, volatile Term oargs,
int nsno; int nsno;
finfo.pad_entries[finfo.padders].len = sz; finfo.pad_entries[finfo.padders].len = sz;
finfo.pad_entries[finfo.padders].pad = (char *)bufp; finfo.pad_entries[finfo.padders].pad = (char *)ubuf;
bufp = NULL; nsno = Yap_open_buf_write_stream(GLOBAL_Stream[sno].encoding, 0);
sz = 0;
nsno = Yap_open_buf_write_stream((char *)bufp, sz,
&GLOBAL_Stream[sno].encoding, 0);
if (osno) { if (osno) {
GLOBAL_Stream[nsno].linepos = GLOBAL_Stream[sno].linepos; GLOBAL_Stream[nsno].linepos = GLOBAL_Stream[sno].linepos;
GLOBAL_Stream[nsno].linecount = GLOBAL_Stream[sno].linecount; GLOBAL_Stream[nsno].linecount = GLOBAL_Stream[sno].linecount;