Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24065

Modified Files: Tag: impd_0_37 g_all_guis.c m_glob.c s_print.c Log Message: small fixes for Matju's changes to compile under Windows

Index: g_all_guis.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_all_guis.c,v retrieving revision 1.1.1.4.2.4.2.5 retrieving revision 1.1.1.4.2.4.2.6 diff -C2 -d -r1.1.1.4.2.4.2.5 -r1.1.1.4.2.4.2.6 *** g_all_guis.c 14 Mar 2004 22:33:54 -0000 1.1.1.4.2.4.2.5 --- g_all_guis.c 19 Mar 2004 20:19:55 -0000 1.1.1.4.2.4.2.6 *************** *** 642,648 **** int pd_scanargs(int argc, t_atom *argv, char *fmt, ...) { int i=0; va_list val; va_start(val,fmt); - int optional=0; for (i=0; i<argc; i++) { switch (fmt[i]) { --- 642,648 ---- int pd_scanargs(int argc, t_atom *argv, char *fmt, ...) { int i=0; + int optional=0; va_list val; va_start(val,fmt); for (i=0; i<argc; i++) { switch (fmt[i]) {

Index: s_print.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_print.c,v retrieving revision 1.1.1.1.16.2.2.2 retrieving revision 1.1.1.1.16.2.2.3 diff -C2 -d -r1.1.1.1.16.2.2.2 -r1.1.1.1.16.2.2.3 *** s_print.c 13 Mar 2004 04:13:23 -0000 1.1.1.1.16.2.2.2 --- s_print.c 19 Mar 2004 20:19:55 -0000 1.1.1.1.16.2.2.3 *************** *** 10,13 **** --- 10,15 ---- #include <errno.h>

+ #define vsnprintf _vsnprintf + /* T.Grill - linked list structure */ typedef struct s_printhook t_printhook; *************** *** 211,218 **** char *special = "${}[]\"\n"; int console_li_old = console_li; console_li += vsnprintf(console_line+console_li, console_ln-console_li, fmt, ap); console_line[console_ln-1]=0; if (!strchr(&console_line[console_li_old],'\n')) return; ! int countbrace=0, i, n = strlen(console_line); for (i=n-1; i>=0; i--) if (strchr(special,console_line[i])) countbrace++; while (n+countbrace>=(int)sizeof(console_line)) n--; --- 213,222 ---- char *special = "${}[]\"\n"; int console_li_old = console_li; + int countbrace, i, n; console_li += vsnprintf(console_line+console_li, console_ln-console_li, fmt, ap); console_line[console_ln-1]=0; if (!strchr(&console_line[console_li_old],'\n')) return; ! countbrace=0; ! n = strlen(console_line); for (i=n-1; i>=0; i--) if (strchr(special,console_line[i])) countbrace++; while (n+countbrace>=(int)sizeof(console_line)) n--;

Index: m_glob.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_glob.c,v retrieving revision 1.1.1.2.2.3.2.3 retrieving revision 1.1.1.2.2.3.2.4 diff -C2 -d -r1.1.1.2.2.3.2.3 -r1.1.1.2.2.3.2.4 *** m_glob.c 16 Mar 2004 21:54:02 -0000 1.1.1.2.2.3.2.3 --- m_glob.c 19 Mar 2004 20:19:55 -0000 1.1.1.2.2.3.2.4 *************** *** 68,74 **** /* see also canvas_done_popup */ void glob_help(t_pd *bogus, t_symbol *s) { t_class *c = class_find(s); if (!c) { post("HUH? no help because no class. (!)"); return; } - char namebuf[MAXPDSTRING], *dir; strcpy(namebuf, class_gethelpname(c)); dir = class_gethelpdir(c); --- 68,74 ---- /* see also canvas_done_popup */ void glob_help(t_pd *bogus, t_symbol *s) { + char namebuf[MAXPDSTRING], *dir; t_class *c = class_find(s); if (!c) { post("HUH? no help because no class. (!)"); return; } strcpy(namebuf, class_gethelpname(c)); dir = class_gethelpdir(c);