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

Modified Files: Tag: desiredata m_class.c x_list.c x_connective.c Log Message: use desire.h instead of redeclaring pd_set_newest

Index: m_class.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_class.c,v retrieving revision 1.3.4.7.2.22.2.1 retrieving revision 1.3.4.7.2.22.2.2 diff -C2 -d -r1.3.4.7.2.22.2.1 -r1.3.4.7.2.22.2.2 *** m_class.c 30 Nov 2006 03:34:23 -0000 1.3.4.7.2.22.2.1 --- m_class.c 5 Dec 2006 23:38:22 -0000 1.3.4.7.2.22.2.2 *************** *** 4,8 ****

#define PD_CLASS_DEF ! #include "m_pd.h" #include "m_imp.h" #include "s_stuff.h" --- 4,8 ----

#define PD_CLASS_DEF ! #include "desire.h" #include "m_imp.h" #include "s_stuff.h" *************** *** 576,593 ****

! t_symbol *gensym(char *s) ! { ! return(dogensym(s, 0)); ! } ! ! static t_symbol *addfileextent(t_symbol *s) ! { ! char namebuf[MAXPDSTRING], *str = s->s_name; ! int ln = strlen(str); ! if (!strcmp(str + ln - 3, ".pd")) return (s); ! strcpy(namebuf, str); ! strcpy(namebuf+ln, ".pd"); ! return (gensym(namebuf)); ! }

static int tryingalready; --- 576,580 ----

! t_symbol *gensym(char *s) {return dogensym(s, 0);}

static int tryingalready; *************** *** 745,750 **** t_floatarg d1, t_floatarg d2, t_floatarg d3, t_floatarg d4, t_floatarg d5);

- void pd_set_newest(t_pd *x); - void pd_typedmess(t_pd *x, t_symbol *s, int argc, t_atom *argv) { --- 732,735 ----

Index: x_connective.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/x_connective.c,v retrieving revision 1.3.4.1.2.10.2.1 retrieving revision 1.3.4.1.2.10.2.2 diff -C2 -d -r1.3.4.1.2.10.2.1 -r1.3.4.1.2.10.2.2 *** x_connective.c 30 Nov 2006 03:57:10 -0000 1.3.4.1.2.10.2.1 --- x_connective.c 5 Dec 2006 23:38:22 -0000 1.3.4.1.2.10.2.2 *************** *** 5,9 **** /* connective objects */

! #include "m_pd.h"

#include <string.h> --- 5,9 ---- /* connective objects */

! #include "desire.h"

#include <string.h> *************** *** 11,16 **** extern t_pd *newest;

- void pd_set_newest(t_pd *); - /* -------------------------- int ------------------------------ */ static t_class *pdint_class; --- 11,14 ----

Index: x_list.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/x_list.c,v retrieving revision 1.2.2.9 retrieving revision 1.2.2.9.2.1 diff -C2 -d -r1.2.2.9 -r1.2.2.9.2.1 *** x_list.c 29 Nov 2006 16:06:29 -0000 1.2.2.9 --- x_list.c 5 Dec 2006 23:38:22 -0000 1.2.2.9.2.1 *************** *** 13,17 **** #define LIST_NGETBYTE 100 /* bigger that this we use alloc, not alloca */

! #include "m_pd.h" /* #include <string.h> */ #ifdef MSW --- 13,17 ---- #define LIST_NGETBYTE 100 /* bigger that this we use alloc, not alloca */

! #include "desire.h" /* #include <string.h> */ #ifdef MSW *************** *** 396,403 **** static void *list_new(t_pd *dummy, t_symbol *s, int argc, t_atom *argv) { - #ifdef DESIRE - void pd_set_newest(t_pd *); t_pd *newest = 0; /* hide global var */ - #endif if (!argc || argv[0].a_type != A_SYMBOL) newest = list_append_new(s, argc, argv); --- 396,400 ----