[PD-cvs] pd/src desire.c,1.1.2.54,1.1.2.55

Thomas Grill xovo at users.sourceforge.net
Mon Nov 21 23:10:07 CET 2005


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

Modified Files:
      Tag: devel_0_39
	desire.c 
Log Message:
fixes for MSVC compilation (no sys_vgui anymore.....)

Index: desire.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v
retrieving revision 1.1.2.54
retrieving revision 1.1.2.55
diff -C2 -d -r1.1.2.54 -r1.1.2.55
*** desire.c	15 Nov 2005 18:49:58 -0000	1.1.2.54
--- desire.c	21 Nov 2005 22:10:01 -0000	1.1.2.55
***************
*** 27,30 ****
--- 27,35 ----
  #define LS fprintf(stderr,"%s:%d in %s (self=%lx\n",__FILE__,__LINE__,__PRETTY_FUNCTION__,(long)self);\
  	fprintf(stderr,"class=%s)\n",((t_gobj *)self)->g_pd->c_name->s_name);
+ 
+ #ifdef _MSC_VER
+ // we don't have macro varargs here....
+ #define sys_vgui
+ #else
  #define sys_vgui(args...) do { \
  	fprintf(stderr,"\e[0;1;31m"); \
***************
*** 32,35 ****
--- 37,41 ----
  	fprintf(stderr,"\e[0m"); \
  	sys_vgui(args); } while(0)
+ #endif
  
  #define template templaet
***************
*** 89,98 ****
  	t_gobj *self = (t_gobj *)self_;
  	t_appendix *d = self->g_adix;
- 	if (!d) {post("no appendix in owner"); return;}
  	int i;
  	for (i=0; i<d->nobs; i++) {
  		t_gobj *obs = d->obs[i];
- 		fprintf(stderr,"obs=%lx\n",(long)obs);
  		t_notice ice = obs->g_pd->c_notice;
  		if (ice) ice(obs,origin,argc,argv);
  		else post("null func ptr for class %s",self->g_pd->c_name->s_name);
--- 95,104 ----
  	t_gobj *self = (t_gobj *)self_;
  	t_appendix *d = self->g_adix;
  	int i;
+ 	if (!d) {post("no appendix in owner"); return;}
  	for (i=0; i<d->nobs; i++) {
  		t_gobj *obs = d->obs[i];
  		t_notice ice = obs->g_pd->c_notice;
+ 		fprintf(stderr,"obs=%lx\n",(long)obs);
  		if (ice) ice(obs,origin,argc,argv);
  		else post("null func ptr for class %s",self->g_pd->c_name->s_name);
***************
*** 10825,10829 ****
  #define IS_A_FLOAT(atom,index)   ((atom+index)->a_type == A_FLOAT)
  #define IS_A_SYMBOL(atom,index)  ((atom+index)->a_type == A_SYMBOL)
! EXTERN void canvas_savecontainerto(t_canvas *x, t_binbuf *b);
  //typedef void (*t_iemfunptr)(void *x, t_glist *glist, int mode);
  
--- 10831,10836 ----
  #define IS_A_FLOAT(atom,index)   ((atom+index)->a_type == A_FLOAT)
  #define IS_A_SYMBOL(atom,index)  ((atom+index)->a_type == A_SYMBOL)
! 
! /*EXTERN*/ void canvas_savecontainerto(t_canvas *x, t_binbuf *b);
  //typedef void (*t_iemfunptr)(void *x, t_glist *glist, int mode);
  





More information about the Pd-cvs mailing list