updated windows macro to automatically defined _WIN32 to smooth Windows building

svn path=/trunk/externals/ggee/; revision=7890

6 files changed, 12 insertions, 12 deletions

diff --git a/experimental/fofsynth~.c b/experimental/fofsynth~.c
index 44c18f0..be8f5a1 100755
--- a/experimental/fofsynth~.c
+++ b/experimental/fofsynth~.c
@@ -10,7 +10,7 @@
 
 /* ------------------------ fofsynth~ ----------------------------- */
 
-#ifndef NT
+#ifndef _WIN32
 void garray_usedindsp(t_garray *x);
 #endif
 
diff --git a/gui/state.c b/gui/state.c
index f078612..063b15f 100755
--- a/gui/state.c
+++ b/gui/state.c
@@ -73,7 +73,7 @@ void state_dosave(t_state *x)
      t_symbol* dir;

      char    dirstr[255];

 

-#ifdef NT

+#ifdef _WIN32

      dir = gensym("");

 #else

      dir = canvas_getdir(x->x_canvas);

@@ -81,7 +81,7 @@ void state_dosave(t_state *x)
 

      strcpy(dirstr,dir->s_name);

 

-#ifndef NT

+#ifndef _WIN32

      strcat(dirstr,"/");

 #endif

 

@@ -176,7 +176,7 @@ void state_load(t_state *x)
      t_symbol* dir;

      char    dirstr[255];

 

-#ifdef NT

+#ifdef _WIN32

      dir = gensym("");

 #else

      dir = canvas_getdir(x->x_canvas);

@@ -184,7 +184,7 @@ void state_load(t_state *x)
 

      strcpy(dirstr,dir->s_name);

 

-#ifndef NT

+#ifndef _WIN32

      strcat(dirstr,"/");

 #endif

 

diff --git a/gui/w_envgen.h b/gui/w_envgen.h
index c7acd81..1cf0081 100755
--- a/gui/w_envgen.h
+++ b/gui/w_envgen.h
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <math.h>
-#ifdef NT
+#ifdef _WIN32
 #pragma warning( disable : 4244 )
 #pragma warning( disable : 4305 )
 #define abs fabs
diff --git a/signal/sfwrite~.c b/signal/sfwrite~.c
index 1b5ed05..dfbdbec 100755
--- a/signal/sfwrite~.c
+++ b/signal/sfwrite~.c
@@ -9,7 +9,7 @@
 

 #include <stdio.h>

 #include <string.h>

-#ifndef NT

+#ifndef _WIN32

 #include <unistd.h>

 #include <sys/mman.h>

 #else

@@ -19,7 +19,7 @@
 #include <sys/stat.h>

 

 

-#ifdef NT

+#ifdef _WIN32

 #define BINREADMODE "rb"

 #define OPENPARAMS O_WRONLY | O_CREAT | O_TRUNC 

 #else

diff --git a/signal/streamin~.c b/signal/streamin~.c
index 87c577c..39446c9 100755
--- a/signal/streamin~.c
+++ b/signal/streamin~.c
@@ -45,7 +45,7 @@
 */

 

 

-#ifdef NT

+#ifdef _WIN32

 extern int close(int);

 extern void sys_rmpollfn(int fd);

 extern sys_addpollfn(int fd, void* fn, void *ptr);

@@ -68,7 +68,7 @@ static void sys_closesocket(int fd)
 #ifdef UNIX

     close(fd);

 #endif

-#ifdef NT

+#ifdef _WIN32

     closesocket(fd);

 #endif

 }

@@ -147,7 +147,7 @@ static void streamin_datapoll(t_streamin *x)
      if (x->nbytes == 0) {      /* get the new tag */

 	  ret = recv(x->x_socket, (char*) &x->frames[x->framein].tag,sizeof(t_tag),MSG_PEEK);

 	  if (ret != sizeof(t_tag)) {

-#ifdef NT

+#ifdef _WIN32

             sys_closesocket(x->x_socket);

             sys_rmpollfn(x->x_socket);

             x->x_socket = -1;

diff --git a/signal/streamout~.c b/signal/streamout~.c
index a9c9d96..c23680e 100755
--- a/signal/streamout~.c
+++ b/signal/streamout~.c
@@ -41,7 +41,7 @@ static void sys_closesocket(int fd)
 #ifdef UNIX

      close(fd); /* shutdown() ?? */

 #endif

-#ifdef NT

+#ifdef _WIN32

     closesocket(fd);

 #endif

 }