From 6b6b1e3cb406ac7d00cab8782c6efa6bf93293ab Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Mon, 16 Jan 2012 04:47:53 +0000 Subject: updated with puredata release 0.43-1 svn path=/trunk/; revision=15874 --- externals/vanilla/bng.c | 2 +- externals/vanilla/cnv.c | 2 +- externals/vanilla/cputime.c | 10 +++++----- externals/vanilla/delwrite~.c | 2 -- externals/vanilla/hradio.c | 2 +- externals/vanilla/hsl.c | 2 +- externals/vanilla/list.c | 2 +- externals/vanilla/loadbang.c | 2 +- externals/vanilla/midirealtimein.c | 2 +- externals/vanilla/namecanvas.c | 2 +- externals/vanilla/nbx.c | 2 +- externals/vanilla/netreceive.c | 2 +- externals/vanilla/netsend.c | 2 +- externals/vanilla/print~.c | 2 +- externals/vanilla/random.c | 2 +- externals/vanilla/realtime.c | 2 +- externals/vanilla/tgl.c | 2 +- externals/vanilla/vsl.c | 2 +- externals/vanilla/vu.c | 2 +- 19 files changed, 22 insertions(+), 24 deletions(-) (limited to 'externals') diff --git a/externals/vanilla/bng.c b/externals/vanilla/bng.c index cc55438e..6ba13533 100644 --- a/externals/vanilla/bng.c +++ b/externals/vanilla/bng.c @@ -16,7 +16,7 @@ #include "g_all_guis.h" #include -#ifdef MSW +#ifdef _WIN32 #include #else #include diff --git a/externals/vanilla/cnv.c b/externals/vanilla/cnv.c index 8b9f0e70..3af29b0a 100644 --- a/externals/vanilla/cnv.c +++ b/externals/vanilla/cnv.c @@ -16,7 +16,7 @@ #include "g_all_guis.h" #include -#ifdef MSW +#ifdef _WIN32 #include #else #include diff --git a/externals/vanilla/cputime.c b/externals/vanilla/cputime.c index c0dddc13..875c065c 100644 --- a/externals/vanilla/cputime.c +++ b/externals/vanilla/cputime.c @@ -16,7 +16,7 @@ #include #include #endif -#ifdef MSW +#ifdef _WIN32 #include #include #endif @@ -36,7 +36,7 @@ typedef struct _cputime #ifdef UNISTD struct tms x_setcputime; #endif -#ifdef MSW +#ifdef _WIN32 LARGE_INTEGER x_kerneltime; LARGE_INTEGER x_usertime; int x_warned; @@ -48,7 +48,7 @@ static void cputime_bang(t_cputime *x) #ifdef UNISTD times(&x->x_setcputime); #endif -#ifdef MSW +#ifdef _WIN32 FILETIME ignorethis, ignorethat; BOOL retval; retval = GetProcessTimes(GetCurrentProcess(), &ignorethis, &ignorethat, @@ -75,7 +75,7 @@ static void cputime_bang2(t_cputime *x) x->x_setcputime.tms_utime - x->x_setcputime.tms_stime) / CLOCKHZ; outlet_float(x->x_obj.ob_outlet, elapsedcpu); #endif -#ifdef MSW +#ifdef _WIN32 t_float elapsedcpu; FILETIME ignorethis, ignorethat; LARGE_INTEGER usertime, kerneltime; @@ -98,7 +98,7 @@ static void *cputime_new(void) outlet_new(&x->x_obj, gensym("float")); inlet_new(&x->x_obj, &x->x_obj.ob_pd, gensym("bang"), gensym("bang2")); -#ifdef MSW +#ifdef _WIN32 x->x_warned = 0; #endif cputime_bang(x); diff --git a/externals/vanilla/delwrite~.c b/externals/vanilla/delwrite~.c index 808c2f00..91f178dc 100644 --- a/externals/vanilla/delwrite~.c +++ b/externals/vanilla/delwrite~.c @@ -53,8 +53,6 @@ static t_int *sigdelwrite_perform(t_int *w) phase -= nsamps; } } - bp = vp + c->c_phase; - c->c_phase = phase; return (w+4); } diff --git a/externals/vanilla/hradio.c b/externals/vanilla/hradio.c index 8016c6b8..547c78a9 100644 --- a/externals/vanilla/hradio.c +++ b/externals/vanilla/hradio.c @@ -18,7 +18,7 @@ put out a "float" as in sliders, toggles, etc. */ #include "g_all_guis.h" #include -#ifdef MSW +#ifdef _WIN32 #include #else #include diff --git a/externals/vanilla/hsl.c b/externals/vanilla/hsl.c index 05474a23..f62fb458 100644 --- a/externals/vanilla/hsl.c +++ b/externals/vanilla/hsl.c @@ -16,7 +16,7 @@ #include "g_all_guis.h" #include -#ifdef MSW +#ifdef _WIN32 #include #else #include diff --git a/externals/vanilla/list.c b/externals/vanilla/list.c index dbd6243f..2e18ac6d 100644 --- a/externals/vanilla/list.c +++ b/externals/vanilla/list.c @@ -156,7 +156,7 @@ static void alist_anything(t_alist *x, t_symbol *s, int argc, t_atom *argv) { x->l_npointer++; gpointer_copy(x->l_vec[i+1].l_a.a_w.w_gpointer, &x->l_vec[i+1].l_p); - x->l_vec[i].l_a.a_w.w_gpointer = &x->l_vec[i].l_p; + x->l_vec[i+1].l_a.a_w.w_gpointer = &x->l_vec[i+1].l_p; } } } diff --git a/externals/vanilla/loadbang.c b/externals/vanilla/loadbang.c index d6aa2d5a..718edb01 100644 --- a/externals/vanilla/loadbang.c +++ b/externals/vanilla/loadbang.c @@ -16,7 +16,7 @@ #include #include #endif -#ifdef MSW +#ifdef _WIN32 #include #include #endif diff --git a/externals/vanilla/midirealtimein.c b/externals/vanilla/midirealtimein.c index 3fdb404d..0f91b317 100644 --- a/externals/vanilla/midirealtimein.c +++ b/externals/vanilla/midirealtimein.c @@ -23,7 +23,7 @@ static void *midirealtimein_new( void) x->x_outlet1 = outlet_new(&x->x_obj, &s_float); x->x_outlet2 = outlet_new(&x->x_obj, &s_float); pd_bind(&x->x_obj.ob_pd, midirealtimein_sym); -#ifndef MSW +#ifndef _WIN32 pd_error(x, "midirealtimein: works under MSW only"); #endif return (x); diff --git a/externals/vanilla/namecanvas.c b/externals/vanilla/namecanvas.c index 52be8701..cd523237 100644 --- a/externals/vanilla/namecanvas.c +++ b/externals/vanilla/namecanvas.c @@ -16,7 +16,7 @@ #include #include #endif -#ifdef MSW +#ifdef _WIN32 #include #include #endif diff --git a/externals/vanilla/nbx.c b/externals/vanilla/nbx.c index badf189b..ceac7cce 100644 --- a/externals/vanilla/nbx.c +++ b/externals/vanilla/nbx.c @@ -14,7 +14,7 @@ #include "g_all_guis.h" #include -#ifdef MSW +#ifdef _WIN32 #include #else #include diff --git a/externals/vanilla/netreceive.c b/externals/vanilla/netreceive.c index 7aa3180e..468bad49 100644 --- a/externals/vanilla/netreceive.c +++ b/externals/vanilla/netreceive.c @@ -9,7 +9,7 @@ #include #include -#ifdef MSW +#ifdef _WIN32 #include #else #include diff --git a/externals/vanilla/netsend.c b/externals/vanilla/netsend.c index 48cc8f60..e2d15ab2 100644 --- a/externals/vanilla/netsend.c +++ b/externals/vanilla/netsend.c @@ -9,7 +9,7 @@ #include #include -#ifdef MSW +#ifdef _WIN32 #include #else #include diff --git a/externals/vanilla/print~.c b/externals/vanilla/print~.c index 6615c34c..bff66f43 100644 --- a/externals/vanilla/print~.c +++ b/externals/vanilla/print~.c @@ -31,7 +31,7 @@ static t_int *print_perform(t_int *w) startpost("%s:", x->x_sym->s_name); for(i=0; ix_count--; diff --git a/externals/vanilla/random.c b/externals/vanilla/random.c index b4a0865d..8e988211 100644 --- a/externals/vanilla/random.c +++ b/externals/vanilla/random.c @@ -16,7 +16,7 @@ #include #include #endif -#ifdef MSW +#ifdef _WIN32 #include #include #endif diff --git a/externals/vanilla/realtime.c b/externals/vanilla/realtime.c index 49041bc6..801d6d8d 100644 --- a/externals/vanilla/realtime.c +++ b/externals/vanilla/realtime.c @@ -16,7 +16,7 @@ #include #include #endif -#ifdef MSW +#ifdef _WIN32 #include #include #endif diff --git a/externals/vanilla/tgl.c b/externals/vanilla/tgl.c index 541521d6..58695732 100644 --- a/externals/vanilla/tgl.c +++ b/externals/vanilla/tgl.c @@ -16,7 +16,7 @@ #include "g_all_guis.h" #include -#ifdef MSW +#ifdef _WIN32 #include #else #include diff --git a/externals/vanilla/vsl.c b/externals/vanilla/vsl.c index fac5d2e8..197a6b35 100644 --- a/externals/vanilla/vsl.c +++ b/externals/vanilla/vsl.c @@ -16,7 +16,7 @@ #include "g_all_guis.h" #include -#ifdef MSW +#ifdef _WIN32 #include #else #include diff --git a/externals/vanilla/vu.c b/externals/vanilla/vu.c index a9afd255..e575e3a7 100644 --- a/externals/vanilla/vu.c +++ b/externals/vanilla/vu.c @@ -16,7 +16,7 @@ #include "g_all_guis.h" #include -#ifdef MSW +#ifdef _WIN32 #include #else #include -- cgit v1.2.1