Woe32 conditional

[Bruno Haible]

This patch changes the conditionals used to recognize the native Woe32
platforms.

2009-07-19  Bruno Haible  <address@hidden>

        Unify conditionals.
        * lib/pipe.h: Detect native Win32 by looking at _WIN32 and __WIN32__
        macros, not at the compiler macros.
        * lib/pipe.c: Likewise.
        * lib/execute.c: Likewise.
        * lib/spawni.c: Likewise.

--- lib/execute.c.orig  2009-07-19 13:11:22.000000000 +0200
+++ lib/execute.c       2009-07-19 13:11:00.000000000 +0200
@@ -35,7 +35,7 @@
 
 #define _(str) gettext (str)
 
-#if defined _MSC_VER || defined __MINGW32__
+#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
 
 /* Native Woe32 API.  */
 # include <process.h>
@@ -104,7 +104,7 @@
         bool slave_process, bool exit_on_error,
         int *termsigp)
 {
-#if defined _MSC_VER || defined __MINGW32__
+#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
 
   /* Native Woe32 API.  */
   int orig_stdin;
--- lib/pipe.c.orig     2009-07-19 13:11:22.000000000 +0200
+++ lib/pipe.c  2009-07-19 13:11:01.000000000 +0200
@@ -35,7 +35,7 @@
 
 #define _(str) gettext (str)
 
-#if defined _MSC_VER || defined __MINGW32__
+#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
 
 /* Native Woe32 API.  */
 # include <process.h>
@@ -112,7 +112,7 @@
             bool slave_process, bool exit_on_error,
             int fd[2])
 {
-#if defined _MSC_VER || defined __MINGW32__
+#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
 
   /* Native Woe32 API.
      This uses _pipe(), dup2(), and spawnv().  It could also be implemented
--- lib/pipe.h.orig     2009-07-19 13:11:22.000000000 +0200
+++ lib/pipe.h  2009-07-19 13:11:00.000000000 +0200
@@ -1,5 +1,5 @@
 /* Creation of subprocesses, communicating via pipes.
-   Copyright (C) 2001-2003, 2006, 2008 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006, 2008-2009 Free Software Foundation, Inc.
    Written by Bruno Haible <address@hidden>, 2001.
 
    This program is free software: you can redistribute it and/or modify
@@ -117,7 +117,7 @@
                               int fd[2]);
 
 /* The name of the "always silent" device.  */
-#if defined _MSC_VER || defined __MINGW32__
+#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
 /* Native Woe32 API.  */
 # define DEV_NULL "NUL"
 #else
--- lib/spawni.c.orig   2009-07-19 13:11:22.000000000 +0200
+++ lib/spawni.c        2009-07-19 13:11:01.000000000 +0200
@@ -89,7 +89,7 @@
 #define SPAWN_ERROR    127
 
 
-#if defined _MSC_VER || defined __MINGW32__
+#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
 
 /* Native Woe32 API.  */
 int