pd/src m_obj.c, 1.2.4.3.2.10, 1.2.4.3.2.10.2.1 m_pd.c, 1.3.8.8, 1.3.8.8.2.1 - Pd-cvs

30 Nov 2006


      Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27076
Modified Files:
      Tag: desiredata
    m_obj.c m_pd.c 
Log Message:
removed #ifdef DESIRE
Index: m_pd.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/m_pd.c,v
retrieving revision 1.3.8.8
retrieving revision 1.3.8.8.2.1
diff -C2 -d -r1.3.8.8 -r1.3.8.8.2.1
*** m_pd.c	6 Jul 2006 18:02:02 -0000	1.3.8.8
--- m_pd.c	30 Nov 2006 03:56:25 -0000	1.3.8.8.2.1
***************
*** 12,22 ****
  {
      t_pd *x;
!     if (!c) 
!         bug ("pd_new: apparently called before setup routine");
      x = (t_pd *)t_getbytes(c->c_size);
      *x = c;
- #ifdef DESIRE
      if (c->c_gobj) ((t_gobj *)x)->g_adix = appendix_new((t_gobj *)x);
- #endif
      if (c->c_patchable)
      {
--- 12,19 ----
  {
      t_pd *x;
!     if (!c) bug("pd_new: apparently called before setup routine");
      x = (t_pd *)t_getbytes(c->c_size);
      *x = c;
      if (c->c_gobj) ((t_gobj *)x)->g_adix = appendix_new((t_gobj *)x);
      if (c->c_patchable)
      {
***************
*** 31,37 ****
      t_class *c = *x;
      if (c->c_freemethod) (*(t_gotfn)(c->c_freemethod))(x);
- #ifdef DESIRE
      if (c->c_gobj) appendix_free((t_gobj *)x);
- #endif
      if (c->c_patchable)
      {
--- 28,32 ----
***************
*** 219,225 ****
  */
- #ifdef DESIRE
  #undef g_next
- #endif
typedef struct _gstack
--- 214,218 ----
Index: m_obj.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/m_obj.c,v
retrieving revision 1.2.4.3.2.10
retrieving revision 1.2.4.3.2.10.2.1
diff -C2 -d -r1.2.4.3.2.10 -r1.2.4.3.2.10.2.1
*** m_obj.c	2 Jul 2006 00:50:23 -0000	1.2.4.3.2.10
--- m_obj.c	30 Nov 2006 03:56:25 -0000	1.2.4.3.2.10.2.1
***************
*** 338,344 ****
  struct _outconnect
  {
- #ifdef DESIRE
      t_gobj oc_gobj;
- #endif
      struct _outconnect *oc_next;
      t_pd *oc_to;
--- 338,342 ----
***************
*** 353,357 ****
  };
- #ifdef DESIRE
  typedef struct _outconnect t_wire;
  t_class *wire_class;
--- 351,354 ----
***************
*** 369,373 ****
    (t_method)wire_free, sizeof(t_wire), CLASS_GOBJ, A_GIMME, 0);
  }
- #endif
t_outlet *outlet_new(t_object *owner, t_symbol *s)
--- 366,369 ----
***************
*** 557,565 ****
      to = &i->i_pd;
  doit:
- #ifdef DESIRE
      oc = wire_new(0,0,0);
- #else
-     oc = (t_outconnect *)t_getbytes(sizeof(*oc));
- #endif
      oc->oc_next = 0;
      oc->oc_to = to;
--- 553,557 ----