Unify conditionals.

diff --git a/ChangeLog b/ChangeLog
index 44d91e6ea8311a7bb8c8eb27b4be5d63d315a672..9ebf21a30302a586c618bc45a7cf9830f1c9fb1b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-07-19  Bruno Haible  <bruno@clisp.org>
+
+       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.
+
 2009-07-19  Bruno Haible  <bruno@clisp.org>
 
        Fix handling of closed stdin/stdout/stderr on mingw.

diff --git a/lib/execute.c b/lib/execute.c
index 5127884c70b21165812184dc023e07b0ecf947ab..253b5a670f3ab3cc6a23c0441b52535ecd439501 100644 (file)
--- a/lib/execute.c
+++ b/lib/execute.c
@@ -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 @@ execute (const char *progname,
         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;

diff --git a/lib/pipe.c b/lib/pipe.c
index c63321c257e02a446c7168c406856f08b5eb31d7..5d91590f391b391c969ccf397694cff0b1810a17 100644 (file)
--- a/lib/pipe.c
+++ b/lib/pipe.c
@@ -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 @@ create_pipe (const char *progname,
             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

diff --git a/lib/pipe.h b/lib/pipe.h
index d76e874f3be3959f984e2899f6b2a8b0c92224a7..03f2c32c03b73aa246bcaa4831ca3b01ad7dd414 100644 (file)
--- a/lib/pipe.h
+++ b/lib/pipe.h
@@ -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 <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
@@ -117,7 +117,7 @@ extern pid_t create_pipe_bidi (const char *progname,
                               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

diff --git a/lib/spawni.c b/lib/spawni.c
index 484a50ba313d4b36d1e0ff906c41592b2979ed6e..af41682578cde7a989f86d52e0fe21532eea2ab4 100644 (file)
--- a/lib/spawni.c
+++ b/lib/spawni.c
@@ -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