Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1:/tmp/cvs-serv26060
Modified Files: Tag: devel_0_37 d_misc.c g_canvas.c g_graph.c g_rtext.c Log Message: fixed 64 bit issues (this time for real??
Index: d_misc.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/d_misc.c,v retrieving revision 1.1.1.1.16.1 retrieving revision 1.1.1.1.16.2 diff -C2 -d -r1.1.1.1.16.1 -r1.1.1.1.16.2 *** d_misc.c 25 Sep 2003 20:07:34 -0000 1.1.1.1.16.1 --- d_misc.c 29 Oct 2003 12:57:42 -0000 1.1.1.1.16.2 *************** *** 131,135 **** scope_erase(x); sys_vgui(".x%x.c create line 10c 5c 20c 5c -tags gumbo\n", x->x_canvas); ! sprintf(s, ".x%x.c create line ", (int)x->x_canvas); s += strlen(s); for (n = 0, phase = x->x_phase; --- 131,135 ---- scope_erase(x); sys_vgui(".x%x.c create line 10c 5c 20c 5c -tags gumbo\n", x->x_canvas); ! sprintf(s, ".x%lx.c create line ", (t_int)x->x_canvas); s += strlen(s); for (n = 0, phase = x->x_phase;
Index: g_canvas.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_canvas.c,v retrieving revision 1.1.1.4.2.5 retrieving revision 1.1.1.4.2.6 diff -C2 -d -r1.1.1.4.2.5 -r1.1.1.4.2.6 *** g_canvas.c 7 Oct 2003 14:31:45 -0000 1.1.1.4.2.5 --- g_canvas.c 29 Oct 2003 12:57:42 -0000 1.1.1.4.2.6 *************** *** 84,88 **** { char tbuf[1024]; ! sprintf(tbuf, "{%s .x%x} ", gl->gl_name->s_name, (int)canvas); strcat(sbuf, tbuf); } --- 84,88 ---- { char tbuf[1024]; ! sprintf(tbuf, "{%s .x%lx} ", gl->gl_name->s_name, (t_int)canvas); strcat(sbuf, tbuf); } *************** *** 662,666 **** x->e_deleted = binbuf_new(); x->e_glist = owner; ! sprintf(buf, ".x%x", (int)owner); x->e_guiconnect = guiconnect_new(&owner->gl_pd, gensym(buf)); return (x); --- 662,666 ---- x->e_deleted = binbuf_new(); x->e_glist = owner; ! sprintf(buf, ".x%lx", (t_int)owner); x->e_guiconnect = guiconnect_new(&owner->gl_pd, gensym(buf)); return (x);
Index: g_graph.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_graph.c,v retrieving revision 1.1.1.3.2.1 retrieving revision 1.1.1.3.2.2 diff -C2 -d -r1.1.1.3.2.1 -r1.1.1.3.2.2 *** g_graph.c 12 Sep 2003 20:55:31 -0000 1.1.1.3.2.1 --- g_graph.c 29 Oct 2003 12:57:42 -0000 1.1.1.3.2.2 *************** *** 81,85 **** { char tag[80]; ! sprintf(tag, "graph%x", (int)gl); glist_eraseiofor(x, &gl->gl_obj, tag); } --- 81,85 ---- { char tag[80]; ! sprintf(tag, "graph%lx", (t_int)gl); glist_eraseiofor(x, &gl->gl_obj, tag); } *************** *** 652,656 **** rtext_erase(glist_findrtext(parent_glist, &x->gl_obj));
! sprintf(tag, "graph%x", (int)x); if (vis) glist_drawiofor(parent_glist, &x->gl_obj, 1, --- 652,656 ---- rtext_erase(glist_findrtext(parent_glist, &x->gl_obj));
! sprintf(tag, "graph%lx", (t_int)x); if (vis) glist_drawiofor(parent_glist, &x->gl_obj, 1,
Index: g_rtext.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_rtext.c,v retrieving revision 1.1.1.2.2.4 retrieving revision 1.1.1.2.2.5 diff -C2 -d -r1.1.1.2.2.4 -r1.1.1.2.2.5 *** g_rtext.c 25 Sep 2003 20:11:29 -0000 1.1.1.2.2.4 --- g_rtext.c 29 Oct 2003 12:57:42 -0000 1.1.1.2.2.5 *************** *** 54,59 **** binbuf_gettext(who->te_binbuf, &x->x_buf, &x->x_bufsize); glist->gl_editor->e_rtext = x; ! sprintf(x->x_tag, ".x%x.t%x", (int)glist_getcanvas(x->x_glist), ! (int)x); return (x); } --- 54,59 ---- binbuf_gettext(who->te_binbuf, &x->x_buf, &x->x_bufsize); glist->gl_editor->e_rtext = x; ! sprintf(x->x_tag, ".x%lx.t%lx", (t_int)glist_getcanvas(x->x_glist), ! (t_int)x); return (x); }