From 0a700207f56f18a7bd95f9e2928cd08ee3d8e50a Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 18 Jan 2011 16:43:02 +0000 Subject: copied update from 0.43.0test4 svn path=/trunk/; revision=14751 --- externals/extra/expr~/vexp.c | 2 +- externals/extra/expr~/vexp.h | 6 +++++- externals/extra/expr~/vexp_fun.c | 10 +++++----- externals/extra/expr~/vexp_if.c | 4 ++-- 4 files changed, 13 insertions(+), 9 deletions(-) (limited to 'externals/extra/expr~') diff --git a/externals/extra/expr~/vexp.c b/externals/extra/expr~/vexp.c index 7d4d7b52..732944de 100644 --- a/externals/extra/expr~/vexp.c +++ b/externals/extra/expr~/vexp.c @@ -2137,6 +2137,6 @@ ex_print(struct ex_ex *eptr) post("\n"); } -#ifdef NT +#ifdef _WIN32 void ABORT( void) {bug("expr");} #endif diff --git a/externals/extra/expr~/vexp.h b/externals/extra/expr~/vexp.h index 92dfb06e..d096842f 100644 --- a/externals/extra/expr~/vexp.h +++ b/externals/extra/expr~/vexp.h @@ -236,9 +236,13 @@ extern void ex_store(t_expr *expr, long int argc, struct ex_ex *argv, int value_getonly(t_symbol *s, t_float *f); -#ifdef NT + +/* These pragmas are only used for MSVC, not MinGW or Cygwin */ +#ifdef _MSC_VER #pragma warning (disable: 4305 4244) +#endif +#ifdef _WIN32 #define abort ABORT void ABORT(void); #endif diff --git a/externals/extra/expr~/vexp_fun.c b/externals/extra/expr~/vexp_fun.c index fba49b18..26b0b767 100644 --- a/externals/extra/expr~/vexp_fun.c +++ b/externals/extra/expr~/vexp_fun.c @@ -123,7 +123,7 @@ static void ex_if(t_expr *expr, long argc, struct ex_ex *argv, struct ex_ex *opt static void ex_ldexp(t_expr *expr, long argc, struct ex_ex *argv, struct ex_ex *optr); static void ex_imodf(t_expr *expr, long argc, struct ex_ex *argv, struct ex_ex *optr); static void ex_modf(t_expr *expr, long argc, struct ex_ex *argv, struct ex_ex *optr); -#ifndef NT +#ifndef _WIN32 static void ex_cbrt(t_expr *expr, long argc, struct ex_ex *argv, struct ex_ex *optr); static void ex_erf(t_expr *expr, long argc, struct ex_ex *argv, struct ex_ex *optr); static void ex_erfc(t_expr *expr, long argc, struct ex_ex *argv, struct ex_ex *optr); @@ -176,7 +176,7 @@ t_ex_func ex_funcs[] = { {"ldexp ", ex_ldexp, 1}, {"imodf ", ex_imodf, 1}, {"modf", ex_modf, 1}, -#ifndef NT +#ifndef _WIN32 {"cbrt", ex_cbrt, 1}, {"erf", ex_erf, 1}, {"erfc", ex_erfc, 1}, @@ -542,7 +542,7 @@ ex_toint(t_expr *e, long int argc, struct ex_ex *argv, struct ex_ex *optr) FUNC_EVAL_UNARY(left, toint, (int), optr, 0); } -#ifdef NT +#ifdef _WIN32 /* No rint in NT land ??? */ double rint(double x); @@ -874,7 +874,7 @@ ex_tanh(t_expr *e, long int argc, struct ex_ex *argv, struct ex_ex *optr) } -#ifndef NT +#ifndef _WIN32 static void ex_asinh(t_expr *e, long argc, struct ex_ex *argv, struct ex_ex *optr) { @@ -1239,7 +1239,7 @@ FUNC_DEF_UNARY(ex_modf, fracmodf, (double), 1); */ FUNC_DEF(ex_ldexp, ldexp, (double), (int), 1); -#ifndef NT +#ifndef _WIN32 /* * ex_cbrt - cube root */ diff --git a/externals/extra/expr~/vexp_if.c b/externals/extra/expr~/vexp_if.c index 648aba73..aaaf4ef3 100644 --- a/externals/extra/expr~/vexp_if.c +++ b/externals/extra/expr~/vexp_if.c @@ -381,7 +381,7 @@ SDY the following coredumps why? post("expr: internal error expr_new"); default: pd_error(x, "expr: bad type (%lx) inlet = %d\n", - eptr->ex_type, i + 1, 0, 0, 0); + eptr->ex_type, i + 1); break; } } @@ -955,7 +955,7 @@ if (!sym || !(garray = (t_garray *)pd_findbyclass(sym, garray_class)) || \ !garray_getfloatwords(garray, &size, &vec)) { \ optr->ex_type = ET_FLT; \ optr->ex_int = 0; \ - error("no such table '%s'", sym->s_name); \ + error("no such table '%s'", sym?(sym->s_name):"(null)"); \ return; \ } -- cgit v1.2.1