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

Modified Files: Tag: desiredata desire.h m_pd.h kernel.c Log Message: fix previous commit and switch gensym to const char

Index: m_pd.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_pd.h,v retrieving revision 1.4.4.11.2.33.2.34 retrieving revision 1.4.4.11.2.33.2.35 diff -C2 -d -r1.4.4.11.2.33.2.34 -r1.4.4.11.2.33.2.35 *** m_pd.h 4 Jan 2007 18:25:13 -0000 1.4.4.11.2.33.2.34 --- m_pd.h 4 Jan 2007 19:24:51 -0000 1.4.4.11.2.33.2.35 *************** *** 483,488 ****

EXTERN t_class *class_find (t_symbol *s); ! EXTERN t_class *class_new( t_symbol *name,t_newmethod nu,t_method free,size_t size,int flags,t_atomtypearg arg1, ...); ! EXTERN t_class *class_new2(const char *name,t_newmethod nu,t_method free,size_t size,int flags,const char *sig); EXTERN void class_addcreator( t_newmethod nu, t_symbol *sel, t_atomtypearg arg1, ...); EXTERN void class_addcreator2(const char *name, t_newmethod nu, const char *original_name, const char *sig); --- 483,488 ----

EXTERN t_class *class_find (t_symbol *s); ! EXTERN t_class *class_new( t_symbol *name,t_newmethod nu,t_method freem,size_t size,int flags,t_atomtypearg arg1, ...); ! EXTERN t_class *class_new2(const char *name,t_newmethod nu,t_method freem,size_t size,int flags,const char *sig); EXTERN void class_addcreator( t_newmethod nu, t_symbol *sel, t_atomtypearg arg1, ...); EXTERN void class_addcreator2(const char *name, t_newmethod nu, const char *original_name, const char *sig);

Index: kernel.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/kernel.c,v retrieving revision 1.1.2.28 retrieving revision 1.1.2.29 diff -C2 -d -r1.1.2.28 -r1.1.2.29 *** kernel.c 4 Jan 2007 18:25:13 -0000 1.1.2.28 --- kernel.c 4 Jan 2007 19:24:51 -0000 1.1.2.29 *************** *** 1250,1260 ****

#ifdef NEWHASH ! static short hash(char *s, size_t n) { unsigned short hash1 = 0, hash2 = 0; #else ! static int hash(char *s, size_t n) { unsigned int hash1 = 0, hash2 = 0; #endif ! char *s2 = s; while (n) { hash1 += *s2; --- 1250,1260 ----

#ifdef NEWHASH ! static short hash(const char *s, size_t n) { unsigned short hash1 = 0, hash2 = 0; #else ! static int hash(const char *s, size_t n) { unsigned int hash1 = 0, hash2 = 0; #endif ! const char *s2 = s; while (n) { hash1 += *s2; *************** *** 1268,1272 **** /* tb: made dogensym() threadsafe * supported by vibrez.net */ ! t_symbol *dogensym(char *s, size_t n, t_symbol *oldsym) { static t_symbol *symhash[HASHSIZE]; #ifdef THREADSAFE_GENSYM --- 1268,1272 ---- /* tb: made dogensym() threadsafe * supported by vibrez.net */ ! t_symbol *dogensym(const char *s, size_t n, t_symbol *oldsym) { static t_symbol *symhash[HASHSIZE]; #ifdef THREADSAFE_GENSYM *************** *** 1320,1325 **** }

! t_symbol *gensym(char *s) {return dogensym(s,strlen(s),0);} ! t_symbol *gensym2(char *s, size_t n) {return dogensym(s,n,0);}

static int tryingalready; --- 1320,1325 ---- }

! t_symbol *gensym( const char *s) {return dogensym(s,strlen(s),0);} ! t_symbol *gensym2(const char *s, size_t n) {return dogensym(s,n,0);}

static int tryingalready;

Index: desire.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.h,v retrieving revision 1.1.2.49.2.24 retrieving revision 1.1.2.49.2.25 diff -C2 -d -r1.1.2.49.2.24 -r1.1.2.49.2.25 *** desire.h 4 Jan 2007 04:58:27 -0000 1.1.2.49.2.24 --- desire.h 4 Jan 2007 19:24:51 -0000 1.1.2.49.2.25 *************** *** 316,321 **** void glob_update_class_info (t_pd *bogus, t_symbol *s, t_symbol *cb_recv, t_symbol *cb_sel);

- #define class_addmethod3(_cl,_ptr,_str,_sig) class_addmethod2(_cl,(t_method)_ptr,gensym(_str),_sig) - #if defined(_LANGUAGE_C_PLUS_PLUS) || defined(__cplusplus) } --- 316,319 ----