cleaned up Windows macros replacing NT with _MSC_VER and _WIN32 where appropriate

svn path=/trunk/externals/cxc/; revision=12415

5 files changed, 17 insertions, 21 deletions

diff --git a/ascwave.c b/ascwave.c
index 662f8e7..9b2031b 100644
--- a/ascwave.c
+++ b/ascwave.c
@@ -3,6 +3,9 @@
 #include "m_pd.h"
 #include <stdio.h>
 #include <stdlib.h>
+#ifdef _WIN32
+#include <malloc.h>
+#endif
 
 #ifndef RAND_MAX
 #define	RAND_MAX	21
@@ -59,16 +62,11 @@ void ascwave_ft1(t_ascwave *x, t_floatarg g)
   int sz = x->x_julp;
   int lchr = x->x_chr;
   int schr = 32;
-  int i = 0;

-#ifndef NT

-  char xip[sz+1];
-  char xap[sz+1];

-#else

-  char* xip;

-  char* xap;

-  xip = (char*)malloc((sz+1)*sizeof(char));

-  xap = (char*)malloc((sz+1)*sizeof(char));

-#endif

+  int i = 0;
+  char* xip;
+  char* xap;
+  xip = (char*)malloc((sz+1)*sizeof(char));
+  xap = (char*)malloc((sz+1)*sizeof(char));
 
   for (i = 0;i <= sz; ++i) {
     if (i == sz-1) {
@@ -99,12 +97,10 @@ void ascwave_ft1(t_ascwave *x, t_floatarg g)
     outlet_symbol(x->t_ob.ob_outlet, gensym(xap));
   if (g > 1)
     outlet_symbol(x->t_ob.ob_outlet, gensym(xip));
-  x->x_jodel = g;

-

-#ifdef NT

-  free(xip);

-  free(xap);

-#endif
+  x->x_jodel = g;
+
+  free(xip);
+  free(xap);
 }
 
 static void ascwave_width(t_ascwave *x, t_floatarg g)
diff --git a/delta~.c b/delta~.c
index 8b1826f..01b59fd 100644
--- a/delta~.c
+++ b/delta~.c
@@ -1,6 +1,6 @@
 #include "m_pd.h"
 #include <math.h>
-#ifdef NT
+#ifdef _MSC_VER
 #pragma warning( disable : 4244 )
 #pragma warning( disable : 4305 )
 #endif
diff --git a/prepend.c b/prepend.c
index 1873266..933f455 100644
--- a/prepend.c
+++ b/prepend.c
@@ -1,5 +1,5 @@
 #include <m_pd.h>
-#ifdef NT
+#ifdef _MSC_VER
 #pragma warning( disable : 4244 )
 #pragma warning( disable : 4305 )
 #endif
diff --git a/split.c b/split.c
index 11d01c0..92fe73d 100644
--- a/split.c
+++ b/split.c
@@ -2,7 +2,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <math.h>
-#ifdef NT
+#ifdef _MSC_VER
 #pragma warning( disable : 4244 )
 #pragma warning( disable : 4305 )
 #endif
diff --git a/utime.c b/utime.c
index 429e90d..ca7987e 100644
--- a/utime.c
+++ b/utime.c
@@ -4,7 +4,7 @@
  */
 
 #include <m_pd.h>
-#ifdef NT
+#ifdef _WIN32
 #include <windows.h>
 #else
 #include <sys/time.h>
@@ -29,7 +29,7 @@ static void *utime_new(t_symbol *s, int argc, t_atom *argv) {
   return (x);
 }
 
-#ifndef NT
+#ifndef _WIN32
 static void utime_bang(t_utime *x)
 {
   struct timeval myutime;