Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2930
Modified Files:
Tag: devel_0_39
desire.c
Log Message:
fixes for GCC 4.1 and also for 64-bit mode
Index: desire.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v
retrieving revision 1.1.2.201
retrieving revision 1.1.2.202
diff -C2 -d -r1.1.2.201 -r1.1.2.202
*** desire.c 24 Nov 2006 01:11:11 -0000 1.1.2.201
--- desire.c 27 Nov 2006 14:06:01 -0000 1.1.2.202
***************
*** 4441,4445 ****
fd->min = fd->max = fd->scrmin = fd->scrmax = fd->quantum = 0;
} else {
! int cpy = (int)MIN(s1-s->s_name,MAXPDSTRING-5), got;
strncpy(strbuf, s->s_name, cpy);
strbuf[cpy] = 0;
--- 4441,4445 ----
fd->min = fd->max = fd->scrmin = fd->scrmax = fd->quantum = 0;
} else {
! long cpy = (int)MIN((long)(s1-s->s_name),(long)(MAXPDSTRING-5)), got;
strncpy(strbuf, s->s_name, cpy);
strbuf[cpy] = 0;
***************
*** 6725,6729 ****
va_list val;
va_start(val,fmt);
! i+=snprintf(buf+i,n-i,"x%x %s", (unsigned)self, sel);
if (i>=n) goto over;
while (*fmt) {
--- 6725,6729 ----
va_list val;
va_start(val,fmt);
! i+=snprintf(buf+i,n-i,"x%lx %s", (long)self, sel);
if (i>=n) goto over;
while (*fmt) {