diff options
| author | Miller Puckette <millerpuckette@users.sourceforge.net> | 2009-09-01 18:22:23 +0000 |
|---|---|---|
| committer | Miller Puckette <millerpuckette@users.sourceforge.net> | 2009-09-01 18:22:23 +0000 |
| commit | 22a829cb1907c79bfe68ad91314a1dddbf1beeb3 (patch) | |
| tree | 510dcb1af070f5eac5b1192d9fffad2f3e431958 /pd/extra/expr~ | |
| parent | 1cc6aed4bfdd84b06d418bc5198a0380479e639a (diff) | |
merge in HC's new tcl code and start taking patches
svn path=/trunk/; revision=12166
Diffstat (limited to 'pd/extra/expr~')
| -rw-r--r-- | pd/extra/expr~/vexp.c | 2 | ||||
| -rw-r--r-- | pd/extra/expr~/vexp.h | 6 | ||||
| -rw-r--r-- | pd/extra/expr~/vexp_fun.c | 10 |
3 files changed, 11 insertions, 7 deletions
diff --git a/pd/extra/expr~/vexp.c b/pd/extra/expr~/vexp.c index 7d4d7b52..732944de 100644 --- a/pd/extra/expr~/vexp.c +++ b/pd/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/pd/extra/expr~/vexp.h b/pd/extra/expr~/vexp.h index 92dfb06e..d096842f 100644 --- a/pd/extra/expr~/vexp.h +++ b/pd/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 <hans@at.or.at> */ +#ifdef _MSC_VER #pragma warning (disable: 4305 4244) +#endif +#ifdef _WIN32 #define abort ABORT void ABORT(void); #endif diff --git a/pd/extra/expr~/vexp_fun.c b/pd/extra/expr~/vexp_fun.c index fba49b18..26b0b767 100644 --- a/pd/extra/expr~/vexp_fun.c +++ b/pd/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 */ |