aboutsummaryrefslogtreecommitdiff
path: root/control
diff options
context:
space:
mode:
Diffstat (limited to 'control')
-rwxr-xr-xcontrol/qread.c4
-rwxr-xr-xcontrol/serialctl.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/control/qread.c b/control/qread.c
index 9538e25..f7c3897 100755
--- a/control/qread.c
+++ b/control/qread.c
@@ -2,7 +2,7 @@
#include <m_pd.h>
-#include "g_canvas.h"
+
/* ------------------------ qread ----------------------------- */
#include <stdio.h>
@@ -34,7 +34,7 @@ static void qread_open(t_qread *x,t_symbol *filename)
return;
}
- canvas_makefilename(glist_getcanvas(x->x_glist), filename->s_name,
+ canvas_makefilename((void*)glist_getcanvas(x->x_glist), filename->s_name,
fname, MAXPDSTRING);
diff --git a/control/serialctl.c b/control/serialctl.c
index 2cbf902..5a8b905 100755
--- a/control/serialctl.c
+++ b/control/serialctl.c
@@ -26,9 +26,9 @@
#define SETBIT(yy,ww,xx) \
if (!strcmp(yy->s_name,#xx)) \
- valid=1,ww |= ##xx;\
+ valid=1,ww |= xx;\
if (!strcmp(yy->s_name,"~"#xx))\
- valid=1,ww &= ~##xx;\
+ valid=1,ww &= ~xx;\
if (!strcmp(yy->s_name,"list"))\
valid=1,post(#xx);
@@ -359,7 +359,7 @@ static void serialctl_send(t_serialctl* x,t_symbol* s)
void serialctl_start(t_serialctl* x)
{
if (x->x_fd >= 0 && !x->started) {
- sys_addpollfn(x->x_fd, (t_fdpollfn)serialctl_read, x);
+ sys_addpollfn(x->x_fd, serialctl_read, x);
post("serialctl: start");
x->started = 1;
}