From c9d724b6da2ae3aceae3896a669420ff3c804f0d Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 22 Jan 2013 17:19:36 +0000 Subject: replace NT with proper macro: _WIN32 (http://msdn.microsoft.com/en-us/library/ff540443.aspx) svn path=/trunk/externals/miXed/; revision=16956 --- cyclone/hammer/acos.c | 2 +- cyclone/hammer/asin.c | 2 +- cyclone/hammer/cartopol.c | 2 +- cyclone/hammer/cosh.c | 2 +- cyclone/hammer/poltocar.c | 2 +- cyclone/hammer/sinh.c | 2 +- cyclone/hammer/tanh.c | 2 +- cyclone/shadow/dummies.c | 2 +- cyclone/shadow/nettles.c | 2 +- cyclone/sickle/acos.c | 2 +- cyclone/sickle/acosh.c | 2 +- cyclone/sickle/asin.c | 2 +- cyclone/sickle/asinh.c | 2 +- cyclone/sickle/atan.c | 2 +- cyclone/sickle/atan2.c | 2 +- cyclone/sickle/atanh.c | 2 +- cyclone/sickle/average.c | 2 +- cyclone/sickle/cartopol.c | 2 +- cyclone/sickle/cosh.c | 2 +- cyclone/sickle/cosx.c | 2 +- cyclone/sickle/linedrive.c | 2 +- cyclone/sickle/log.c | 2 +- cyclone/sickle/lores.c | 2 +- cyclone/sickle/onepole.c | 2 +- cyclone/sickle/poltocar.c | 2 +- cyclone/sickle/pow.c | 2 +- cyclone/sickle/reson.c | 2 +- cyclone/sickle/sinh.c | 2 +- cyclone/sickle/sinx.c | 2 +- cyclone/sickle/svf.c | 2 +- cyclone/sickle/tanh.c | 2 +- cyclone/sickle/tanx.c | 2 +- shared/common/mifi.c | 4 ++-- shared/common/port.c | 2 +- shared/sickle/sic.c | 2 +- shared/toxy/scriptlet.c | 2 +- shared/unstable/loader.c | 8 ++++---- toxy/plustot.env.c | 2 +- 38 files changed, 42 insertions(+), 42 deletions(-) diff --git a/cyclone/hammer/acos.c b/cyclone/hammer/acos.c index 3f3abea..7175476 100644 --- a/cyclone/hammer/acos.c +++ b/cyclone/hammer/acos.c @@ -5,7 +5,7 @@ #include #include "m_pd.h" -#if defined(NT) || defined(MACOSX) +#if defined(_WIN32) || defined(MACOSX) /* cf pd/src/x_arithmetic.c */ #define acosf acos #endif diff --git a/cyclone/hammer/asin.c b/cyclone/hammer/asin.c index 0aa8db7..18f8c72 100644 --- a/cyclone/hammer/asin.c +++ b/cyclone/hammer/asin.c @@ -5,7 +5,7 @@ #include #include "m_pd.h" -#if defined(NT) || defined(MACOSX) +#if defined(_WIN32) || defined(MACOSX) /* cf pd/src/x_arithmetic.c */ #define asinf asin #endif diff --git a/cyclone/hammer/cartopol.c b/cyclone/hammer/cartopol.c index 4200686..ce9f546 100644 --- a/cyclone/hammer/cartopol.c +++ b/cyclone/hammer/cartopol.c @@ -5,7 +5,7 @@ #include #include "m_pd.h" -#if defined(NT) || defined(MACOSX) +#if defined(_WIN32) || defined(MACOSX) /* cf pd/src/x_arithmetic.c */ #define atan2f atan2 #define hypotf hypot diff --git a/cyclone/hammer/cosh.c b/cyclone/hammer/cosh.c index 77d1567..664c169 100644 --- a/cyclone/hammer/cosh.c +++ b/cyclone/hammer/cosh.c @@ -5,7 +5,7 @@ #include #include "m_pd.h" -#if defined(NT) || defined(MACOSX) +#if defined(_WIN32) || defined(MACOSX) /* cf pd/src/x_arithmetic.c */ #define coshf cosh #endif diff --git a/cyclone/hammer/poltocar.c b/cyclone/hammer/poltocar.c index 486eead..d634b8f 100644 --- a/cyclone/hammer/poltocar.c +++ b/cyclone/hammer/poltocar.c @@ -5,7 +5,7 @@ #include #include "m_pd.h" -#if defined(NT) || defined(MACOSX) +#if defined(_WIN32) || defined(MACOSX) /* cf pd/src/x_arithmetic.c */ #define sinf sin #define cosf cos diff --git a/cyclone/hammer/sinh.c b/cyclone/hammer/sinh.c index 93fb6fa..d3d41fb 100644 --- a/cyclone/hammer/sinh.c +++ b/cyclone/hammer/sinh.c @@ -5,7 +5,7 @@ #include #include "m_pd.h" -#if defined(NT) || defined(MACOSX) +#if defined(_WIN32) || defined(MACOSX) /* cf pd/src/x_arithmetic.c */ #define sinhf sinh #endif diff --git a/cyclone/hammer/tanh.c b/cyclone/hammer/tanh.c index e124d4c..470fb21 100644 --- a/cyclone/hammer/tanh.c +++ b/cyclone/hammer/tanh.c @@ -5,7 +5,7 @@ #include #include "m_pd.h" -#if defined(NT) || defined(MACOSX) +#if defined(_WIN32) || defined(MACOSX) /* cf pd/src/x_arithmetic.c */ #define tanhf tanh #endif diff --git a/cyclone/shadow/dummies.c b/cyclone/shadow/dummies.c index f55c683..18ce3e8 100644 --- a/cyclone/shadow/dummies.c +++ b/cyclone/shadow/dummies.c @@ -6,7 +6,7 @@ #ifdef UNIX #include #endif -#ifdef NT +#ifdef _WIN32 #include #endif #include "m_pd.h" diff --git a/cyclone/shadow/nettles.c b/cyclone/shadow/nettles.c index d7ccb87..83fae9b 100644 --- a/cyclone/shadow/nettles.c +++ b/cyclone/shadow/nettles.c @@ -8,7 +8,7 @@ #include "sickle/sic.h" #include "shadow.h" -#if defined(NT) || defined(MACOSX) +#if defined(_WIN32) || defined(MACOSX) /* cf pd/src/x_arithmetic.c */ #define fmodf fmod #endif diff --git a/cyclone/sickle/acos.c b/cyclone/sickle/acos.c index 1dd5719..df248d0 100644 --- a/cyclone/sickle/acos.c +++ b/cyclone/sickle/acos.c @@ -6,7 +6,7 @@ #include "m_pd.h" #include "sickle/sic.h" -#if defined(NT) || defined(MACOSX) +#if defined(_WIN32) || defined(MACOSX) /* cf pd/src/x_arithmetic.c */ #define acosf acos #endif diff --git a/cyclone/sickle/acosh.c b/cyclone/sickle/acosh.c index 392ad97..5402711 100644 --- a/cyclone/sickle/acosh.c +++ b/cyclone/sickle/acosh.c @@ -7,7 +7,7 @@ #include "sickle/sic.h" /* LATER ask about osx */ -#if defined(NT) || defined(MACOSX) +#if defined(_WIN32) || defined(MACOSX) #define acoshf(x) (log(x + sqrt(x * x - 1))) #endif diff --git a/cyclone/sickle/asin.c b/cyclone/sickle/asin.c index 05e5c28..fbaaea1 100644 --- a/cyclone/sickle/asin.c +++ b/cyclone/sickle/asin.c @@ -6,7 +6,7 @@ #include "m_pd.h" #include "sickle/sic.h" -#if defined(NT) || defined(MACOSX) +#if defined(_WIN32) || defined(MACOSX) /* cf pd/src/x_arithmetic.c */ #define asinf asin #endif diff --git a/cyclone/sickle/asinh.c b/cyclone/sickle/asinh.c index 931cb1f..11dcb81 100644 --- a/cyclone/sickle/asinh.c +++ b/cyclone/sickle/asinh.c @@ -7,7 +7,7 @@ #include "sickle/sic.h" /* LATER ask about osx */ -#if defined(NT) || defined(MACOSX) +#if defined(_WIN32) || defined(MACOSX) #define asinhf(x) (log(x + sqrt(x * x + 1))) #endif diff --git a/cyclone/sickle/atan.c b/cyclone/sickle/atan.c index f541fa4..832cdb3 100644 --- a/cyclone/sickle/atan.c +++ b/cyclone/sickle/atan.c @@ -6,7 +6,7 @@ #include "m_pd.h" #include "sickle/sic.h" -#if defined(NT) || defined(MACOSX) +#if defined(_WIN32) || defined(MACOSX) /* cf pd/src/x_arithmetic.c */ #define atanf atan #endif diff --git a/cyclone/sickle/atan2.c b/cyclone/sickle/atan2.c index 171fc17..32598fd 100644 --- a/cyclone/sickle/atan2.c +++ b/cyclone/sickle/atan2.c @@ -6,7 +6,7 @@ #include "m_pd.h" #include "sickle/sic.h" -#if defined(NT) || defined(MACOSX) +#if defined(_WIN32) || defined(MACOSX) /* cf pd/src/x_arithmetic.c */ #define atan2f atan2 #endif diff --git a/cyclone/sickle/atanh.c b/cyclone/sickle/atanh.c index 464f955..130677a 100644 --- a/cyclone/sickle/atanh.c +++ b/cyclone/sickle/atanh.c @@ -7,7 +7,7 @@ #include "sickle/sic.h" /* LATER ask about osx */ -#if defined(NT) || defined(MACOSX) +#if defined(_WIN32) || defined(MACOSX) #define atanhf(x) (log((1 + x) / (1 - x)) * 0.5) #endif diff --git a/cyclone/sickle/average.c b/cyclone/sickle/average.c index 74adfc8..679d59f 100644 --- a/cyclone/sickle/average.c +++ b/cyclone/sickle/average.c @@ -10,7 +10,7 @@ #include "common/loud.h" #include "sickle/sic.h" -#if defined(NT) || defined(MACOSX) +#if defined(_WIN32) || defined(MACOSX) /* cf pd/src/x_arithmetic.c */ #define sqrtf sqrt #endif diff --git a/cyclone/sickle/cartopol.c b/cyclone/sickle/cartopol.c index e33f782..2823268 100644 --- a/cyclone/sickle/cartopol.c +++ b/cyclone/sickle/cartopol.c @@ -7,7 +7,7 @@ #include "unstable/fragile.h" #include "sickle/sic.h" -#if defined(NT) || defined(MACOSX) +#if defined(_WIN32) || defined(MACOSX) /* cf pd/src/x_arithmetic.c */ #define atan2f atan2 #define hypotf hypot diff --git a/cyclone/sickle/cosh.c b/cyclone/sickle/cosh.c index ae5f8cb..52d1733 100644 --- a/cyclone/sickle/cosh.c +++ b/cyclone/sickle/cosh.c @@ -6,7 +6,7 @@ #include "m_pd.h" #include "sickle/sic.h" -#if defined(NT) || defined(MACOSX) +#if defined(_WIN32) || defined(MACOSX) /* cf pd/src/x_arithmetic.c */ #define coshf cosh #endif diff --git a/cyclone/sickle/cosx.c b/cyclone/sickle/cosx.c index b368559..c9f14ec 100644 --- a/cyclone/sickle/cosx.c +++ b/cyclone/sickle/cosx.c @@ -9,7 +9,7 @@ /* by definition, this is just an interface to the -lm call (do not use costable) */ -#if defined(NT) || defined(MACOSX) +#if defined(_WIN32) || defined(MACOSX) /* cf pd/src/x_arithmetic.c */ #define cosf cos #endif diff --git a/cyclone/sickle/linedrive.c b/cyclone/sickle/linedrive.c index 99c3720..a8a4ac5 100644 --- a/cyclone/sickle/linedrive.c +++ b/cyclone/sickle/linedrive.c @@ -6,7 +6,7 @@ #include "m_pd.h" #include "common/fitter.h" -#if defined(NT) || defined(MACOSX) +#if defined(_WIN32) || defined(MACOSX) #define logf log #define expf exp #endif diff --git a/cyclone/sickle/log.c b/cyclone/sickle/log.c index 74e3e40..66d2146 100644 --- a/cyclone/sickle/log.c +++ b/cyclone/sickle/log.c @@ -6,7 +6,7 @@ #include "m_pd.h" #include "sickle/sic.h" -#if defined(NT) || defined(MACOSX) +#if defined(_WIN32) || defined(MACOSX) /* cf pd/src/x_arithmetic.c */ #define logf log #endif diff --git a/cyclone/sickle/lores.c b/cyclone/sickle/lores.c index 937f3b1..83d2b35 100644 --- a/cyclone/sickle/lores.c +++ b/cyclone/sickle/lores.c @@ -12,7 +12,7 @@ #include "shared.h" #include "sickle/sic.h" -#if defined(NT) || defined(MACOSX) +#if defined(_WIN32) || defined(MACOSX) /* cf pd/src/x_arithmetic.c */ #define expf exp #define cosf cos diff --git a/cyclone/sickle/onepole.c b/cyclone/sickle/onepole.c index 0772c80..29fe64f 100644 --- a/cyclone/sickle/onepole.c +++ b/cyclone/sickle/onepole.c @@ -12,7 +12,7 @@ #include "shared.h" #include "sickle/sic.h" -#if defined(NT) || defined(MACOSX) +#if defined(_WIN32) || defined(MACOSX) /* cf pd/src/x_arithmetic.c */ #define sinf sin #endif diff --git a/cyclone/sickle/poltocar.c b/cyclone/sickle/poltocar.c index 8d7f94c..bf72637 100644 --- a/cyclone/sickle/poltocar.c +++ b/cyclone/sickle/poltocar.c @@ -7,7 +7,7 @@ #include "unstable/fragile.h" #include "sickle/sic.h" -#if defined(NT) || defined(MACOSX) +#if defined(_WIN32) || defined(MACOSX) /* cf pd/src/x_arithmetic.c */ #define sinf sin #define cosf cos diff --git a/cyclone/sickle/pow.c b/cyclone/sickle/pow.c index 11cd508..caaa06c 100644 --- a/cyclone/sickle/pow.c +++ b/cyclone/sickle/pow.c @@ -6,7 +6,7 @@ #include "m_pd.h" #include "sickle/sic.h" -#if defined(NT) || defined(MACOSX) +#if defined(_WIN32) || defined(MACOSX) /* cf pd/src/x_arithmetic.c */ #define powf pow #endif diff --git a/cyclone/sickle/reson.c b/cyclone/sickle/reson.c index 40969c7..29d3e61 100644 --- a/cyclone/sickle/reson.c +++ b/cyclone/sickle/reson.c @@ -13,7 +13,7 @@ #include "shared.h" #include "sickle/sic.h" -#if defined(NT) || defined(MACOSX) +#if defined(_WIN32) || defined(MACOSX) /* cf pd/src/x_arithmetic.c */ #define expf exp #define cosf cos diff --git a/cyclone/sickle/sinh.c b/cyclone/sickle/sinh.c index 523c28a..1596168 100644 --- a/cyclone/sickle/sinh.c +++ b/cyclone/sickle/sinh.c @@ -6,7 +6,7 @@ #include "m_pd.h" #include "sickle/sic.h" -#if defined(NT) || defined(MACOSX) +#if defined(_WIN32) || defined(MACOSX) /* cf pd/src/x_arithmetic.c */ #define sinhf sinh #endif diff --git a/cyclone/sickle/sinx.c b/cyclone/sickle/sinx.c index b303024..db0567d 100644 --- a/cyclone/sickle/sinx.c +++ b/cyclone/sickle/sinx.c @@ -9,7 +9,7 @@ /* by definition, this is just an interface to the -lm call (do not use costable) */ -#if defined(NT) || defined(MACOSX) +#if defined(_WIN32) || defined(MACOSX) /* cf pd/src/x_arithmetic.c */ #define sinf sin #endif diff --git a/cyclone/sickle/svf.c b/cyclone/sickle/svf.c index 74fcf99..82e81a9 100644 --- a/cyclone/sickle/svf.c +++ b/cyclone/sickle/svf.c @@ -14,7 +14,7 @@ #include "shared.h" #include "sickle/sic.h" -#if defined(NT) || defined(MACOSX) +#if defined(_WIN32) || defined(MACOSX) /* cf pd/src/x_arithmetic.c */ #define sinf sin #endif diff --git a/cyclone/sickle/tanh.c b/cyclone/sickle/tanh.c index 7473dcf..1f7f83f 100644 --- a/cyclone/sickle/tanh.c +++ b/cyclone/sickle/tanh.c @@ -6,7 +6,7 @@ #include "m_pd.h" #include "sickle/sic.h" -#if defined(NT) || defined(MACOSX) +#if defined(_WIN32) || defined(MACOSX) /* cf pd/src/x_arithmetic.c */ #define tanhf tanh #endif diff --git a/cyclone/sickle/tanx.c b/cyclone/sickle/tanx.c index d2a1102..5f86f8f 100644 --- a/cyclone/sickle/tanx.c +++ b/cyclone/sickle/tanx.c @@ -9,7 +9,7 @@ /* by definition, this is just an interface to the -lm call (do not use costable) */ -#if defined(NT) || defined(MACOSX) +#if defined(_WIN32) || defined(MACOSX) /* cf pd/src/x_arithmetic.c */ #define tanf tan #endif diff --git a/shared/common/mifi.c b/shared/common/mifi.c index 4da9f55..44b9483 100644 --- a/shared/common/mifi.c +++ b/shared/common/mifi.c @@ -2,7 +2,7 @@ * For information on usage and redistribution, and for a DISCLAIMER OF ALL * WARRANTIES, see the file, "LICENSE.txt," in this distribution. */ -#ifdef NT +#ifdef _WIN32 #include #else #include @@ -27,7 +27,7 @@ typedef u_int16_t uint16; #ifndef uchar typedef u_int8_t uchar; #endif -#elif defined(NT) +#elif defined(_WIN32) #ifndef uint32 typedef unsigned long uint32; #endif diff --git a/shared/common/port.c b/shared/common/port.c index ffce677..6fdcaef 100644 --- a/shared/common/port.c +++ b/shared/common/port.c @@ -10,7 +10,7 @@ #ifdef UNIX #include #endif -#ifdef NT +#ifdef _WIN32 #include #endif #include diff --git a/shared/sickle/sic.c b/shared/sickle/sic.c index 3630b2b..a306095 100644 --- a/shared/sickle/sic.c +++ b/shared/sickle/sic.c @@ -14,7 +14,7 @@ //#define SIC_DEBUG #endif -#if defined(NT) || defined(MACOSX) +#if defined(_WIN32) || defined(MACOSX) /* cf pd/src/x_arithmetic.c */ #define cosf cos #endif diff --git a/shared/toxy/scriptlet.c b/shared/toxy/scriptlet.c index 622512e..804e0b2 100644 --- a/shared/toxy/scriptlet.c +++ b/shared/toxy/scriptlet.c @@ -7,7 +7,7 @@ #ifdef UNIX #include #endif -#ifdef NT +#ifdef _WIN32 #include #endif #include "m_pd.h" diff --git a/shared/unstable/loader.c b/shared/unstable/loader.c index e8ca544..62e9aaf 100644 --- a/shared/unstable/loader.c +++ b/shared/unstable/loader.c @@ -13,7 +13,7 @@ #include #include #endif -#ifdef NT +#ifdef _WIN32 #include #include #endif @@ -47,7 +47,7 @@ static char sys_dllextent[] = #ifdef MACOSX ".pd_darwin"; #endif -#ifdef NT +#ifdef _WIN32 ".dll"; #endif @@ -56,7 +56,7 @@ static int unstable_doload_lib(char *dirname, char *classname) char symname[MAXPDSTRING], filename[MAXPDSTRING], *lastdot; void *dlobj; t_xxx makeout; -#ifdef NT +#ifdef _WIN32 HINSTANCE ntdll; #endif /* refabricate the pathname */ @@ -88,7 +88,7 @@ static int unstable_doload_lib(char *dirname, char *classname) } makeout = (t_xxx)dlsym(dlobj, symname); #endif -#ifdef NT +#ifdef _WIN32 sys_bashfilename(filename, filename); ntdll = LoadLibrary(filename); if (!ntdll) diff --git a/toxy/plustot.env.c b/toxy/plustot.env.c index ba28bbb..155ff8c 100644 --- a/toxy/plustot.env.c +++ b/toxy/plustot.env.c @@ -7,7 +7,7 @@ #ifdef UNIX #include #endif -#ifdef NT +#ifdef _WIN32 #include #endif #include "m_pd.h" -- cgit v1.2.1