Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17469
Modified Files: Tag: desiredata m_pd.h Log Message: removed #ifdef DESIRE
Index: m_pd.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_pd.h,v retrieving revision 1.4.4.11.2.33 retrieving revision 1.4.4.11.2.33.2.1 diff -C2 -d -r1.4.4.11.2.33 -r1.4.4.11.2.33.2.1 *** m_pd.h 28 Nov 2006 03:53:32 -0000 1.4.4.11.2.33 --- m_pd.h 30 Nov 2006 03:30:36 -0000 1.4.4.11.2.33.2.1 *************** *** 162,166 **** } t_atom;
- #ifdef DESIRE EXTERN_STRUCT _hash; #define t_hash struct _hash --- 162,165 ---- *************** *** 205,209 **** t_appendix *appendix_new (struct _gobj *master); void appendix_free(struct _gobj *self); - #endif
#ifdef PD_PLUSPLUS_FACE --- 204,207 ---- *************** *** 215,225 **** t_pd g_pd; /* pure datum header (class) */ #endif - #ifdef DESIRE /* g_next is moved out to keep ABI compat */ t_appendix *g_adix; /* voyeurism (observable/observer/etc) */ #define g_next g_adix->next - #else - struct _gobj *g_next; /* next in list */ - #endif } t_gobj;
--- 213,219 ---- *************** *** 415,419 **** #endif
- #ifdef DESIRE EXTERN void gobj_subscribe (t_gobj *self, t_gobj *observer); EXTERN void gobj_unsubscribe (t_gobj *self, t_gobj *observer); --- 409,412 ---- *************** *** 421,425 **** EXTERN void gobj_changed2 (t_gobj *self, int argc, t_atom *argv); EXTERN void gobj_changed3 (t_gobj *self, t_gobj *origin, int argc, t_atom *argv); - #endif
/* ----------------- pointers ---------------- */ --- 414,417 ---- *************** *** 473,484 **** /* ---------------- widget behaviors ---------------------- */
! #ifndef DESIRE ! EXTERN_STRUCT _widgetbehavior; ! #define t_widgetbehavior struct _widgetbehavior ! #endif ! EXTERN_STRUCT _parentwidgetbehavior; #define t_parentwidgetbehavior struct _parentwidgetbehavior EXTERN t_parentwidgetbehavior *pd_getparentwidget(t_pd *x);
/* -------------------- classes -------------- */ --- 465,473 ---- /* ---------------- widget behaviors ---------------------- */
! #if 1 /* this should go away soon */ EXTERN_STRUCT _parentwidgetbehavior; #define t_parentwidgetbehavior struct _parentwidgetbehavior EXTERN t_parentwidgetbehavior *pd_getparentwidget(t_pd *x); + #endif
/* -------------------- classes -------------- */ *************** *** 492,496 **** #define CLASS_TYPEMASK 3
- /* this is a hack so that scons plusplus=1 works */ #ifdef __cplusplus typedef int t_atomtypearg; --- 481,484 ---- *************** *** 514,520 **** EXTERN void class_addanything(t_class *c, t_method fn); EXTERN void class_sethelpsymbol(t_class *c, t_symbol *s); - #ifndef DESIRE - EXTERN void class_setwidget(t_class *c, t_widgetbehavior *w); - #endif EXTERN void class_setparentwidget(t_class *c, t_parentwidgetbehavior *w); EXTERN t_parentwidgetbehavior *class_parentwidget(t_class *c); --- 502,505 ---- *************** *** 527,534 **** class_domainsignalin(c, (char *)(&((type *)0)->field) - (char *)0)
- #ifdef DESIRE typedef void (*t_notice)(struct _gobj *x, struct _gobj *origin, int argc, t_atom *argv); EXTERN void class_setnotice(t_class *c, t_notice notice); - #endif
/* prototype for functions to save Pd's to a binbuf */ --- 512,517 ---- *************** *** 537,547 **** EXTERN t_savefn class_getsavefn(t_class *c);
- #ifndef DESIRE - /* prototype for functions to open properties dialogs */ - typedef void (*t_propertiesfn)(t_gobj *x, struct _glist *glist); - EXTERN void class_setpropertiesfn(t_class *c, t_propertiesfn f); - EXTERN t_propertiesfn class_getpropertiesfn(t_class *c); - #endif - #ifndef PD_CLASS_DEF #define class_addbang(x, y) class_addbang((x), (t_method)(y)) --- 520,523 ----