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

Modified Files: Tag: desiredata desire.c builtins.c desire.h Log Message: moving class_addmethod3 to <desire.h>

Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.217.2.109 retrieving revision 1.1.2.217.2.110 diff -C2 -d -r1.1.2.217.2.109 -r1.1.2.217.2.110 *** desire.c 3 Jan 2007 10:39:09 -0000 1.1.2.217.2.109 --- desire.c 4 Jan 2007 04:58:25 -0000 1.1.2.217.2.110 *************** *** 62,66 **** #endif

- #define class_addmethod3(_cl,_ptr,_str,_sig) class_addmethod2(_cl,(t_method)_ptr,gensym(_str),_sig) #define canvas_each(CHILD,CANVAS) for(t_gobj *CHILD=(CANVAS)->list; CHILD; CHILD=CHILD->g_next) #define canvases_each(CANVAS) for(t_canvas *CANVAS=canvas_list; CANVAS; CANVAS=CANVAS->gl_next) --- 62,65 ---- *************** *** 7984,7990 **** #define S(name) void name##_setup(void); name##_setup(); void conf_init_plus(void) { ! S(x_arithmetic) S(x_midi) S(x_misc) S(x_net) S(x_qlist) ! S(x_gui) S(x_list) ! S(desire) }

--- 7983,7987 ---- #define S(name) void name##_setup(void); name##_setup(); void conf_init_plus(void) { ! S(builtins) S(builtins_dsp) S(desire) }

*************** *** 7993,7998 **** void conf_init(void) { conf_init_plus(); ! S(d_arithmetic) S(d_array) S(d_ctl) S(d_dac) S(d_delay) S(d_fft) S(d_filter) S(d_global) ! S(d_math) S(d_misc) S(d_osc) S(d_soundfile) S(d_ugen) } }; --- 7990,7994 ---- void conf_init(void) { conf_init_plus(); ! S(d_soundfile) S(d_ugen) } };

Index: desire.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.h,v retrieving revision 1.1.2.49.2.23 retrieving revision 1.1.2.49.2.24 diff -C2 -d -r1.1.2.49.2.23 -r1.1.2.49.2.24 *** desire.h 3 Jan 2007 08:42:08 -0000 1.1.2.49.2.23 --- desire.h 4 Jan 2007 04:58:27 -0000 1.1.2.49.2.24 *************** *** 316,319 **** --- 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) }

Index: builtins.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/builtins.c,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -C2 -d -r1.1.2.5 -r1.1.2.6 *** builtins.c 3 Jan 2007 20:19:00 -0000 1.1.2.5 --- builtins.c 4 Jan 2007 04:58:27 -0000 1.1.2.6 *************** *** 1,3 **** ! /* Copyright (c) 2006-2007 Mathieu Bouchard Copyright (c) 1997-1999 Miller Puckette. For information on usage and redistribution, --- 1,3 ---- ! /* Copyright (c) 2007 Mathieu Bouchard Copyright (c) 1997-1999 Miller Puckette. For information on usage and redistribution, *************** *** 62,66 **** template <class T> T min(T a, T b) {return a<b?a:b;} template <class T> T max(T a, T b) {return a>b?a:b;} - #define class_addmethod3(_cl,_ptr,_str,_sig) class_addmethod2(_cl,(t_method)_ptr,gensym(_str),_sig)

float mtof(float f) { --- 62,65 ----