Merge branch 'compile-fixes' into 'master'

Jonathan Wilkes · Jonathan Wilkes · commit 3e28a71e618b · 2024-07-23T13:52:03.000Z
Compilation fixes

See merge request jwilkes/purr-data!864
diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml
@@ -10,7 +10,7 @@ on:
 jobs:
   macos-build:
 
-    runs-on: macos-latest
+    runs-on: macos-12
 
     steps:
     - uses: actions/checkout@v3
diff --git a/debuild/debian/control b/debuild/debian/control
@@ -2,7 +2,7 @@ Source: purr-data
 Section: sound
 Priority: extra
 Maintainer: Albert Graef <aggraef@gmail.com>
-Build-Depends: debhelper (>= 7.0.50~), autoconf, automake, libtool, pkg-config, bison, flex, libgtk2.0-dev, libgtk-3-dev, dh-python, flite1-dev, ladspa-sdk, libasound2-dev, libjack-dev, libbluetooth-dev, libcairo2-dev, libgl1-mesa-dev | libgl-dev, libglew1.6-dev | libglew-dev, libgsl-dev | libgsl0-dev, libmagick++-dev, libavifile-0.7-dev, libdc1394-dev | libdc1394-22-dev, libfftw3-dev, libfluidsynth-dev, libftgl-dev, libgsm1-dev, libjpeg-dev, libmp3lame-dev, libmpeg3-dev, libquicktime-dev, libraw1394-dev, libsmpeg-dev, libspeex-dev, libstk-dev | libstk0-dev, libtiff5-dev, libv4l-dev, libdv4-dev, libiec61883-dev, libxv-dev, libxxf86vm-dev, libvorbis-dev, zlib1g-dev (>= 1:1.1.3), rsync, libgconf2-dev, libnss3-dev, libxtst-dev, libxss-dev
+Build-Depends: debhelper (>= 7.0.50~), autoconf, automake, libtool, pkg-config, bison, flex, libgtk2.0-dev, libgtk-3-dev, dh-python, flite1-dev, ladspa-sdk, libasound2-dev, libjack-dev, libbluetooth-dev, libcairo2-dev, libgl1-mesa-dev | libgl-dev, libglew1.6-dev | libglew-dev, libgsl-dev | libgsl0-dev, libmagick++-dev, libavifile-0.7-dev, libdc1394-dev | libdc1394-22-dev, libfftw3-dev, libfluidsynth-dev, libftgl-dev, libgsm1-dev, libjpeg-dev, libmp3lame-dev, libmpeg3-dev, libquicktime-dev, libraw1394-dev, libsmpeg-dev, libspeex-dev, libstk-dev | libstk0-dev, libtiff5-dev, libv4l-dev, libdv4-dev, libiec61883-dev, libxv-dev, libxxf86vm-dev, libvorbis-dev, zlib1g-dev (>= 1:1.1.3), rsync, libgconf2-dev, libnss3-dev, libxtst-dev, libxss-dev, libtirpc-dev
 Standards-Version: 3.9.5
 Homepage: https://git.purrdata.net/jwilkes/purr-data
 
diff --git a/externals/Makefile b/externals/Makefile
@@ -488,12 +488,6 @@ cyclone_clean:
 #------------------------------------------------------------------------------#
 # DISIS
 disis:
-ifneq ($(OS_NAME),windows)
-ifneq ($(OS_NAME),darwin)
-	cd $(externals_src)/disis/cwiid && aclocal && autoconf && \
-		./configure --without-python && make
-endif
-endif
 	make -C $(externals_src)/disis PD_PATH=$(pd_src) pdbinpath=$(pd_src)/src CFLAGS="$(CFLAGS_ADD)"
 
 disis_install:
@@ -744,6 +738,11 @@ endif
 # default gemmacoswindow which doesn't work for me, YMMV.
 gem_window = --with-sdl2 --with-sdl2-LIBS="-L$(usrlocal)/lib -lSDL2" --with-defaultwindow=gemsdl2window
 
+# As of automake 1.16.5 from homebrew, libtool compilation of Objective C++
+# sources seem to be broken. As a work-around, the LIBTOOLFLAGS=--tag=CXX
+# setting appears to fix that.
+export LIBTOOLFLAGS = --tag=CXX
+
 $(gem_src)/Gem.pd_darwin: $(gem_src)/configure
 	cd $(gem_src) && ./configure \
 		CXXFLAGS="-DHAVE_S_STUFF_H $(CFLAGS_ADD)" \
diff --git a/externals/disis/cwiid b/externals/disis/cwiid
@@ -1 +1 @@
-Subproject commit 3046fa0248999819c4709b9e53679c6824bd0168
+Subproject commit 03b0722d7c9f09d12cc5043abd4d2094c3d0114f
diff --git a/externals/disis/makefile b/externals/disis/makefile
@@ -6,8 +6,6 @@ class.sources = disis_phasor~.c
 disis_munger~.class.sources = disis_munger.c ADSR.c
 define forLinux
     class.sources += disis_netsend.c disis_netreceive.c
-    disis_wiimote.class.sources = disis_wiimote.c
-    disis_wiimote.class.ldlibs = $(CWIID_LIB_STATIC) -lbluetooth -lpthread
 endef
 define forDarwin
     class.sources += disis_netsend.c disis_netreceive.c
diff --git a/externals/ggee/signal/streamin~.c b/externals/ggee/signal/streamin~.c
@@ -49,7 +49,7 @@
 extern int close(int);
 #endif
 extern void sys_rmpollfn(int fd);
-extern sys_addpollfn(int fd, void* fn, void *ptr);
+extern int sys_addpollfn(int fd, void* fn, void *ptr);
 
 static void sys_sockerror(char *s)
 {
diff --git a/externals/iem/iemguts/src/autoabstraction.c b/externals/iem/iemguts/src/autoabstraction.c
@@ -164,7 +164,7 @@ void autoabstraction_setup(void)
   iemguts_boilerplate("automatic abstraction creator", 0);
 #ifdef AUTOABSTRACTION_ENABLED
   autoabstraction_initialize();
-  sys_register_loader(autoabstraction_loader);
+  sys_register_loader((loader_t)autoabstraction_loader);
 #warning FIXME loader-0.47 mode!
 #else
   error("autoabstraction needs to be compiled against Pd 0.40 or higher,\n");
diff --git a/externals/iem/iemguts/src/canvasdelete.c b/externals/iem/iemguts/src/canvasdelete.c
@@ -48,7 +48,7 @@ static void canvasdelete_doit(t_canvasdelete *x)
   else {
     t_atom ap[1];
     SETFLOAT(ap, 1);
-    typedmess(x->x_gobj, gensym("menuclose"), 1, ap);
+    typedmess((t_pd*)x->x_gobj, gensym("menuclose"), 1, ap);
   }
 
 
@@ -83,7 +83,7 @@ static void *canvasdelete_new(t_floatarg f)
     depth--;
   }
 
-  x->x_glist = x->x_gobj = NULL;
+  x->x_glist = NULL; x->x_gobj = NULL;
   if (!depth) {
     x->x_glist = canvas;
     x->x_gobj=obj;
diff --git a/externals/iem/iemguts/src/findbrokenobjects.c b/externals/iem/iemguts/src/findbrokenobjects.c
@@ -100,7 +100,7 @@ static void fbo_iterate(t_findbrokenobjects*x, t_canvas*cnv, int verbose) {
     cls=pd_class(&g->g_pd);
     if (cls == canvas_class) {
       // this is just another abstraction, recurse into it
-      fbo_iterate(x, ob, verbose);
+      fbo_iterate(x, (t_canvas*)ob, verbose);
     } else if (cls == text_class) {
       t_binbuf*bb=ob->te_binbuf;
       t_atom*argv=binbuf_getvec(bb);
diff --git a/externals/iemlib/iemlib2/src/protect_against_open.c b/externals/iemlib/iemlib2/src/protect_against_open.c
@@ -110,7 +110,7 @@ void protect_against_open_setup(void)
   protect_against_open_widgetbehavior.w_selectfn = NULL;
   protect_against_open_widgetbehavior.w_activatefn = NULL;
   protect_against_open_widgetbehavior.w_deletefn = NULL;
-  protect_against_open_widgetbehavior.w_visfn = protect_against_open_vis;
+  protect_against_open_widgetbehavior.w_visfn = (t_method)protect_against_open_vis;
   protect_against_open_widgetbehavior.w_clickfn = NULL;
 #if defined(PD_MAJOR_VERSION) && (PD_MINOR_VERSION >= 37)
 
diff --git a/externals/lyonpotpourri/bashfest~.c b/externals/lyonpotpourri/bashfest~.c
@@ -936,7 +936,7 @@ void bashfest_copy_to_MSP_buffer(t_bashfest *x, int slot)
 }
 void bashfest_deploy_dsp(t_bashfest *x)
 {
-    float *b_samples = x->b_samples;
+    float *b_samples = (float*)x->b_samples;
     long b_nchans = x->b_nchans;
     long b_frames = x->b_frames;
     t_event *events = x->events;
diff --git a/externals/lyonpotpourri/sarec~.c b/externals/lyonpotpourri/sarec~.c
@@ -351,7 +351,7 @@ void sarec_attach_buffer(t_sarec *x)
 	t_garray *a; 
 	t_symbol *bufname = x->bufname;
 	int b_frames;
-	float *b_samples = x->b_samples;
+	t_word *b_samples = x->b_samples;
 	if (!(a = (t_garray *)pd_findbyclass(bufname, garray_class))) {
 		if (*bufname->s_name) pd_error(x, "%s: %s: no such array",OBJECT_NAME,bufname->s_name);
         x->b_valid = 0;
@@ -397,4 +397,4 @@ void sarec_dsp(t_sarec *x, t_signal **sp)
     
 	dsp_addv(sarec_perform, pointer_count, (t_int *) sigvec);
 	free(sigvec);	
-}
+}
diff --git a/externals/lyonpotpourri/sel~.c b/externals/lyonpotpourri/sel~.c
@@ -45,7 +45,7 @@ void *sel_new(t_symbol *msg, short argc, t_atom *argv)
         outlet_new(&x->x_obj, gensym("signal"));
     }
     
-	x->matches = (t_double *) malloc(x->length * sizeof(double));
+	x->matches = (t_float *) malloc(x->length * sizeof(t_float));
 
 	for(i = 0; i < argc; i++){
 		x->matches[i] = (double)atom_getfloatarg(i,argc,argv);
@@ -97,7 +97,7 @@ t_int *sel_perform(t_int *w)
     
     // clean each outlet
 	for(j = 0; j < length; j++){
-		match_outlet = (t_double *) outs[j];
+		match_outlet = (t_float *) outs[j];
 		for(i = 0; i < n; i++){
 			match_outlet[i] = 0.0;
 		}
@@ -107,7 +107,7 @@ t_int *sel_perform(t_int *w)
 		if(inlet[i]){
 			for(j = 0; j < length; j++){
 				if( inlet[i] == matches[j]){
-					match_outlet = (t_double *) outs[j];
+					match_outlet = (t_float *) outs[j];
 					match_outlet[i] = 1.0; // always send a unity click
 				}
 			}
diff --git a/externals/lyonpotpourri/shoehorn~.c b/externals/lyonpotpourri/shoehorn~.c
@@ -16,7 +16,7 @@ typedef struct _shoehorn
     double pio2;
     t_float *inarr;
     t_float **loc_invecs;
-    t_float *outs;
+    t_float **outs;
     double advFrac;
     double *pangains1;
     double *pangains2;
diff --git a/externals/miXed/cyclone/hammer/funbuff.c b/externals/miXed/cyclone/hammer/funbuff.c
@@ -393,7 +393,7 @@ static void funbuff_interptab(t_funbuff *x, t_symbol *s, t_floatarg f)
 {
     int vsz;
     t_word *vec;
-    if (vec = vefl_get(s, &vsz, 0, (t_pd *)x))
+    if (vec = (t_word*)vefl_get(s, &vsz, 0, (t_pd *)x))
     {
 	if (vsz > 2)
 	    funbuff_dointerp(x, f, vsz, vec);
diff --git a/externals/miXed/cyclone/sickle/buffir.c b/externals/miXed/cyclone/sickle/buffir.c
@@ -117,7 +117,7 @@ static t_int *buffir_perform(t_int *w)
 	t_float *oin = (t_float *)(w[4]);
 	t_float *sin = (t_float *)(w[5]);
 	int vecsize = sic->s_vecsize;
-	t_word *vec = sic->s_vectors[0];  /* playable implies nonzero (mono) */
+	t_word *vec = (t_word*)sic->s_vectors[0];  /* playable implies nonzero (mono) */
 	int histsize = x->x_histsize;
 	while (nblock--)
 	{
diff --git a/externals/miXed/cyclone/sickle/cycle.c b/externals/miXed/cyclone/sickle/cycle.c
@@ -31,7 +31,7 @@ static void cycle_gettable(t_cycle *x)
     if (x->x_name)
     {
 	int tabsize = 0;
-	t_word *table = vefl_get(x->x_name, &tabsize, 1, (t_pd *)x);
+	t_word *table = (t_word*)vefl_get(x->x_name, &tabsize, 1, (t_pd *)x);
 	/* CHECKED buffer is copied */
 	if (table)
 	{
diff --git a/externals/miXed/cyclone/sickle/index.c b/externals/miXed/cyclone/sickle/index.c
@@ -37,7 +37,7 @@ static t_int *index_perform(t_int *w)
 	t_index *x = (t_index *)sic;
 	t_float *xin = (t_float *)(w[3]);
 	int index, maxindex = sic->s_vecsize - 1;
-	t_word *vp = sic->s_vectors[x->x_effchannel];
+	t_word *vp = (t_word*)sic->s_vectors[x->x_effchannel];
 	if (vp)  /* handle array swapping on the fly via ft1 */
 	{
 	    while (nblock--)
diff --git a/externals/miXed/cyclone/sickle/lookup.c b/externals/miXed/cyclone/sickle/lookup.c
@@ -31,7 +31,7 @@ static t_int *lookup_perform(t_int *w)
 	t_float *oin = (t_float *)(w[4]);
 	t_float *sin = (t_float *)(w[5]);
 	int vecsize = sic->s_vecsize;
-	t_word *vec = sic->s_vectors[0];  /* playable implies nonzero (mono) */
+	t_word *vec = (t_word*)sic->s_vectors[0];  /* playable implies nonzero (mono) */
 	while (nblock--)
 	{
 	    float off = *oin++;  /* msp: converted to int (if not a signal) */
diff --git a/externals/miXed/cyclone/sickle/peek.c b/externals/miXed/cyclone/sickle/peek.c
@@ -53,7 +53,7 @@ static void peek_float(t_peek *x, t_float f)
     t_arsic *sic = (t_arsic *)x;
     t_word *vp;
     arsic_validate(sic, 0);  /* LATER rethink (efficiency, and complaining) */
-    if (vp = sic->s_vectors[x->x_effchannel])
+    if (vp = (t_word*)sic->s_vectors[x->x_effchannel])
     {
 	int ndx = (int)f;
 	if (ndx >= 0 && ndx < sic->s_vecsize)
diff --git a/externals/miXed/cyclone/sickle/play.c b/externals/miXed/cyclone/sickle/play.c
@@ -30,7 +30,7 @@ static t_int *play_perform(t_int *w)
 	t_play *x = (t_play *)sic;
 	t_float *xin = (t_float *)(w[3]);
 	int vecsize = sic->s_vecsize;
-	t_word **vectable = sic->s_vectors;
+	t_word **vectable = (t_word**)sic->s_vectors;
 	float ksr = sic->s_ksr;
 	int nointerp = 0;
 	int maxindex = (nointerp ? vecsize - 1 : vecsize - 3);
diff --git a/externals/miXed/cyclone/sickle/poke.c b/externals/miXed/cyclone/sickle/poke.c
@@ -55,7 +55,7 @@ static void poke_float(t_poke *x, t_float f)
     t_arsic *sic = (t_arsic *)x;
     t_word *vp;
     arsic_validate(sic, 0);  /* LATER rethink (efficiency, and complaining) */
-    if (vp = sic->s_vectors[x->x_effchannel])
+    if (vp = (t_word*)sic->s_vectors[x->x_effchannel])
     {
 	int ndx = (int)*x->x_indexptr;
 	if (ndx >= 0 && ndx < sic->s_vecsize)
@@ -88,7 +88,7 @@ static t_int *poke_perform(t_int *w)
     t_float *in1 = (t_float *)(w[3]);
     t_float *in2 = (t_float *)(w[4]);
     t_poke *x = (t_poke *)sic;
-    t_word *vp = sic->s_vectors[x->x_effchannel];
+    t_word *vp = (t_word*)sic->s_vectors[x->x_effchannel];
     if (vp && sic->s_playable)
     {
 	int vecsize = sic->s_vecsize;
diff --git a/externals/miXed/cyclone/sickle/record.c b/externals/miXed/cyclone/sickle/record.c
@@ -155,7 +155,7 @@ static t_int *record_perform(t_int *w)
 	ch = nch;
 	while (ch--)
 	{
-	    t_word *vp = sic->s_vectors[ch];
+	    t_word *vp = (t_word*)sic->s_vectors[ch];
 	    if (vp)
 	    {
 		t_float *ip = (t_float *)(w[3 + ch]) + ndone;
diff --git a/externals/miXed/cyclone/sickle/wave.c b/externals/miXed/cyclone/sickle/wave.c
@@ -43,7 +43,7 @@ static t_int *wave_perform(t_int *w)
 	t_float *sin = (t_float *)(w[4]);
 	t_float *ein = (t_float *)(w[5]);
 	int vecsize = sic->s_vecsize;
-	t_word **vectable = sic->s_vectors;
+	t_word **vectable = (t_word**)sic->s_vectors;
 	float ksr = sic->s_ksr;
 	int nointerp = x->x_nointerp;
 	int maxindex = (nointerp ? vecsize - 1 : vecsize - 3);
diff --git a/externals/moonlib/mknob.c b/externals/moonlib/mknob.c
@@ -125,8 +125,8 @@ static void mknob_draw_new(t_mknob *x, t_glist *glist)
         xpos,
         ypos,
         glist_istoplevel(glist),
-        !iemgui_has_snd(x),
-        !iemgui_has_rcv(x)
+        !iemgui_has_snd((t_iemgui*)x),
+        !iemgui_has_rcv((t_iemgui*)x)
     );
     mknob_draw_config(x, glist);
 }
@@ -169,10 +169,10 @@ static void mknob_save(t_gobj *z, t_binbuf *b)
                 atom_getsymbol(binbuf_getvec(x->x_gui.x_obj.te_binbuf)),
                 x->x_gui.x_w, x->x_gui.x_h,
                 (t_float)x->x_min, (t_float)x->x_max,
-                x->x_lin0_log1, iem_symargstoint(x),
+                x->x_lin0_log1, iem_symargstoint((t_iemgui*)x),
                 srl[0], srl[1], srl[2],
                 x->x_gui.x_ldx, x->x_gui.x_ldy,
-                iem_fstyletoint(x), x->x_gui.x_fontsize,
+                iem_fstyletoint((t_iemgui*)x), x->x_gui.x_fontsize,
                 bflcol[0], bflcol[1], bflcol[2],
                 x->x_val, x->x_steady);
     binbuf_addv(b, ";");
@@ -313,7 +313,7 @@ static void mknob_bang(t_mknob *x)
     if((out < 1.0e-10)&&(out > -1.0e-10))
         out = 0.0;
     outlet_float(x->x_gui.x_obj.ob_outlet, out);
-    if (iemgui_has_snd(x) && x->x_gui.x_snd->s_thing)
+    if (iemgui_has_snd((t_iemgui*)x) && x->x_gui.x_snd->s_thing)
         pd_float(x->x_gui.x_snd->s_thing, out);
 }
 
@@ -570,7 +570,7 @@ static void mknob_float(t_mknob *x, t_floatarg f)
     if (x->x_gui.x_put_in2out)
     {
         outlet_float(x->x_gui.x_obj.ob_outlet, out);
-        if (iemgui_has_snd(x) && x->x_gui.x_snd->s_thing)
+        if (iemgui_has_snd((t_iemgui*)x) && x->x_gui.x_snd->s_thing)
             pd_float(x->x_gui.x_snd->s_thing, out);
     }
 }
@@ -695,7 +695,7 @@ static void *mknob_new(t_symbol *s, int argc, t_atom *argv)
         iemgui_new_getnames(&x->x_gui, 6, argv);
         ldx = (int)atom_getintarg(9, argc, argv);
         ldy = (int)atom_getintarg(10, argc, argv);
-        iem_inttofstyle(x, atom_getintarg(11, argc, argv));
+        iem_inttofstyle((t_iemgui*)x, atom_getintarg(11, argc, argv));
         fs = (int)atom_getintarg(12, argc, argv);
         bflcol[0] = (int)atom_getintarg(13, argc, argv);
         bflcol[1] = (int)atom_getintarg(14, argc, argv);
@@ -730,7 +730,7 @@ static void *mknob_new(t_symbol *s, int argc, t_atom *argv)
     {
         x->x_gui.x_font_style = 0;
     }
-    if (iemgui_has_rcv(x)) pd_bind(&x->x_gui.x_obj.ob_pd, x->x_gui.x_rcv);
+    if (iemgui_has_rcv((t_iemgui*)x)) pd_bind(&x->x_gui.x_obj.ob_pd, x->x_gui.x_rcv);
     x->x_gui.x_ldx = ldx;
     x->x_gui.x_ldy = ldy;
     if(fs < 4)
@@ -757,7 +757,7 @@ static void *mknob_new(t_symbol *s, int argc, t_atom *argv)
 
 static void mknob_free(t_mknob *x)
 {
-    if (iemgui_has_rcv(x))
+    if (iemgui_has_rcv((t_iemgui*)x))
         pd_unbind(&x->x_gui.x_obj.ob_pd, x->x_gui.x_rcv);
     gfxstub_deleteforkey(x);
 }
diff --git a/externals/unauthorized/grid.c b/externals/unauthorized/grid.c
@@ -165,7 +165,7 @@ static void grid_draw_configure(t_grid *x, t_glist *glist)
         x->x_grid,
         x->x_xlines,
         x->x_ylines);
-    if (glist_isselected(glist, &x->x_obj))
+    if (glist_isselected(glist, (t_gobj*)&x->x_obj))
         grid_draw_select(x, glist);
     canvas_fixlinesfor( canvas, (t_text*)x );
 }
@@ -854,7 +854,7 @@ static t_grid *grid_new(t_symbol *s, int argc, t_atom *argv)
     // post( "grid_new name : %s width: %d height : %d",
     // x->x_name->s_name, x->x_width, x->x_height );
 
-    x->x_handle = scalehandle_new((t_object *)x, x->x_glist, 1,
+    x->x_handle = (t_pd*)scalehandle_new((t_object *)x, x->x_glist, 1,
         grid__clickhook, grid__motionhook);
 
     return (x);
diff --git a/externals/unauthorized/mp3amp~.c b/externals/unauthorized/mp3amp~.c
@@ -234,7 +234,7 @@ static int mp3amp_decode_input(t_mp3amp *x)
     unsigned int a,b,c,d;
     unsigned long cheader;
     signed short int *p = (signed short int *) x->x_out;
-    t_int     pbytes;
+    int       pbytes;
     t_int     ret, totlength=0;
     t_int     pframes = 0;
 
diff --git a/packages/darwin_app/Makefile b/packages/darwin_app/Makefile
@@ -205,8 +205,8 @@ dmg:
 	$(MAKE) -C $(packages_src) \
 		DESTDIR="/Volumes/$(VOLUME_NAME)/*.app/Contents/Resources" doc_format
 	chmod -R a-w /Volumes/$(VOLUME_NAME)/*.app/Contents/Resources
-# 3 retries
-	hdiutil detach `mount | grep $(VOLUME_NAME) | cut -d ' ' -f 1` || hdiutil detach `mount | grep $(VOLUME_NAME) | cut -d ' ' -f 1` || hdiutil detach `mount | grep $(VOLUME_NAME) | cut -d ' ' -f 1`
+# max 5 retries
+	nretries=5; volm=$$(mount | grep $(VOLUME_NAME) | cut -d ' ' -f 1); sleep 1; until [[ $$nretries -le 0 ]] || hdiutil detach $$volm; do echo "detach failed, retrying"; sleep 1; nretries=$$(expr $$nretries - 1); done
 	rm -f "$(PACKAGE_NAME).dmg"
 	hdiutil convert -format UDZO -o "$(PACKAGE_NAME).dmg" build.dmg
 	rm -f build.dmg
diff --git a/pd/src/m_obj.c b/pd/src/m_obj.c
@@ -86,7 +86,7 @@ static int inlet_fwd(t_inlet *x, t_symbol *s, int argc, t_atom *argv)
     if(x->i_symfrom == &s_signal
         && zcheckgetfn(x->i_dest, gensym("fwd"), A_GIMME, A_NULL))
     {
-        mess3(x->i_dest, gensym("fwd"), s, argc, argv);
+        mess3i(x->i_dest, gensym("fwd"), s, argc, argv);
         return 1;
     }
     return 0;
diff --git a/pd/src/m_pd.h b/pd/src/m_pd.h
@@ -347,6 +347,8 @@ typedef void (*t_gotfn2)(void *x, void *arg1, void *arg2);
 #define mess2(x, s, a,b) ((*(t_gotfn2)getfn((x), (s)))((x), (a),(b)))
 typedef void (*t_gotfn3)(void *x, void *arg1, void *arg2, void *arg3);
 #define mess3(x, s, a,b,c) ((*(t_gotfn3)getfn((x), (s)))((x), (a),(b),(c)))
+typedef void (*t_gotfn3i)(void *x, void *arg1, int arg2, void *arg3);
+#define mess3i(x, s, a,b,c) ((*(t_gotfn3i)getfn((x), (s)))((x), (a),(b),(c)))
 typedef void (*t_gotfn4)(void *x,
     void *arg1, void *arg2, void *arg3, void *arg4);
 #define mess4(x, s, a,b,c,d) \

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@`
`49`	`49`	`extern int close(int);`
`50`	`50`	`#endif`
`51`	`51`	`extern void sys_rmpollfn(int fd);`
`52`		`-extern sys_addpollfn(int fd, void* fn, void *ptr);`
	`52`	`+extern int sys_addpollfn(int fd, void* fn, void *ptr);`
`53`	`53`
`54`	`54`	`static void sys_sockerror(char *s)`
`55`	`55`	`{`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ static void canvasdelete_doit(t_canvasdelete *x)`
`48`	`48`	`else {`
`49`	`49`	`t_atom ap[1];`
`50`	`50`	`SETFLOAT(ap, 1);`
`51`		`- typedmess(x->x_gobj, gensym("menuclose"), 1, ap);`
	`51`	`+ typedmess((t_pd*)x->x_gobj, gensym("menuclose"), 1, ap);`
`52`	`52`	`}`
`53`	`53`
`54`	`54`
`@@ -83,7 +83,7 @@ static void *canvasdelete_new(t_floatarg f)`
`83`	`83`	`depth--;`
`84`	`84`	`}`
`85`	`85`
`86`		`- x->x_glist = x->x_gobj = NULL;`
	`86`	`+ x->x_glist = NULL; x->x_gobj = NULL;`
`87`	`87`	`if (!depth) {`
`88`	`88`	`x->x_glist = canvas;`
`89`	`89`	`x->x_gobj=obj;`