[PD-cvs] pd/src g_rtext.c, 1.4.8.2, 1.4.8.3 g_canvas.h, 1.3.4.3.2.7, 1.3.4.3.2.8 g_all_guis.h, 1.4.8.1, 1.4.8.2 desire.c, 1.1.2.15, 1.1.2.16

[Mathieu Bouchard]

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

Modified Files:
      Tag: devel_0_39
	g_rtext.c g_canvas.h g_all_guis.h desire.c 
Log Message:
getting DesireData to compile again


Index: g_all_guis.h
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_all_guis.h,v
retrieving revision 1.4.8.1
retrieving revision 1.4.8.2
diff -C2 -d -r1.4.8.1 -r1.4.8.2
*** g_all_guis.h	21 Aug 2005 11:28:24 -0000	1.4.8.1
--- g_all_guis.h	16 Sep 2005 19:20:04 -0000	1.4.8.2
***************
*** 4,7 ****
--- 4,10 ----
  /* g_7_guis.h written by Thomas Musil (c) IEM KUG Graz Austria 2000-2001 */
  
+ #ifndef __G_ALL_GUIS_H
+ #define __G_ALL_GUIS_H
+ #ifndef DESIRE
  
  #define IEM_GUI_COLNR_WHITE          0
***************
*** 332,333 ****
--- 335,339 ----
  EXTERN void iem_inttofstyle(t_iem_fstyle_flags *fstylep, int n);
  EXTERN int iem_fstyletoint(t_iem_fstyle_flags *fstylep);
+ 
+ #endif /* DESIRE */
+ #endif /* __G_ALL_GUIS_H */

Index: g_rtext.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_rtext.c,v
retrieving revision 1.4.8.2
retrieving revision 1.4.8.3
diff -C2 -d -r1.4.8.2 -r1.4.8.3
*** g_rtext.c	12 Jul 2005 15:11:09 -0000	1.4.8.2
--- g_rtext.c	16 Sep 2005 19:20:04 -0000	1.4.8.3
***************
*** 7,10 ****
--- 7,13 ----
  /* all changes are labeled with      iemlib      */
  
+ /*HAAACK!!!*/
+ #undef DESIRE
+ 
  #include <stdlib.h>
  #include <string.h>

Index: g_canvas.h
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_canvas.h,v
retrieving revision 1.3.4.3.2.7
retrieving revision 1.3.4.3.2.8
diff -C2 -d -r1.3.4.3.2.7 -r1.3.4.3.2.8
*** g_canvas.h	11 Sep 2005 11:58:00 -0000	1.3.4.3.2.7
--- g_canvas.h	16 Sep 2005 19:20:04 -0000	1.3.4.3.2.8
***************
*** 40,43 ****
--- 40,44 ----
  #ifndef __G_CANVAS_H
  #define __G_CANVAS_H
+ #ifndef DESIRE
  
  #if defined(_LANGUAGE_C_PLUS_PLUS) || defined(__cplusplus)
***************
*** 63,70 ****
--- 64,75 ----
  typedef void (*t_glistmotionfn)(void *z, t_floatarg dx, t_floatarg dy);
  typedef void (*t_glistkeyfn)(void *z, t_floatarg key);
+ #endif /*DESIRE*/
+ 
  
  EXTERN_STRUCT _rtext;
  #define t_rtext struct _rtext
  
+ #ifndef DESIRE
+ 
  EXTERN_STRUCT _gtemplate;
  #define t_gtemplate struct _gtemplate
***************
*** 433,438 ****
--- 438,445 ----
  EXTERN int text_ypix(t_text *x, t_glist *glist);
  EXTERN int text_shouldvis(t_text *x, t_glist *glist);
+ #endif /*DESIRE */
  
  /* -------------------- functions on rtexts ------------------------- */
+ 
  #define RTEXT_DOWN 1
  #define RTEXT_DRAG 2
***************
*** 460,463 ****
--- 467,471 ----
  
  /* -------------------- functions on canvases ------------------------ */
+ #ifndef DESIRE
  EXTERN t_class *canvas_class;
  
***************
*** 633,636 ****
  #endif
  
! #endif
  
--- 641,645 ----
  #endif
  
! #endif /* DESIRE */
! #endif /* __G_CANVAS_H */
  

Index: desire.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v
retrieving revision 1.1.2.15
retrieving revision 1.1.2.16
diff -C2 -d -r1.1.2.15 -r1.1.2.16
*** desire.c	16 Sep 2005 19:13:09 -0000	1.1.2.15
--- desire.c	16 Sep 2005 19:20:04 -0000	1.1.2.16
***************
*** 1493,1497 ****
  void canvas_floatatom(t_glist *gl, t_symbol *s, int argc, t_atom *argv);
  void canvas_symbolatom(t_glist *gl, t_symbol *s, int argc, t_atom *argv);
! void glist_scalar(t_glist *canvas, t_symbol *s, int argc, t_atom *argv);
  
  void g_graph_setup(void);
--- 1493,1497 ----
  void canvas_floatatom(t_glist *gl, t_symbol *s, int argc, t_atom *argv);
  void canvas_symbolatom(t_glist *gl, t_symbol *s, int argc, t_atom *argv);
! void glist_scalar(t_glist *canvas, t_symbol *s, t_int argc, t_atom *argv);
  
  void g_graph_setup(void);
***************
*** 8395,8400 ****
      int *p_nextmsg, int selectit);
  
! void glist_scalar(t_glist *glist,
!     t_symbol *classname, t_int argc, t_atom *argv)
  {
      t_symbol *templatesym =
--- 8395,8399 ----
      int *p_nextmsg, int selectit);
  
! void glist_scalar(t_glist *glist, t_symbol *classname, t_int argc, t_atom *argv)
  {
      t_symbol *templatesym =