Mercurial > hg > octave-lojdl > gnulib-hg
changeset 11720:dad85cd90e2e
Unify conditionals.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Sun, 19 Jul 2009 13:13:43 +0200 |
| parents | 21991b412914 |
| children | 54dacd4ed1a5 |
| files | ChangeLog lib/execute.c lib/pipe.c lib/pipe.h lib/spawni.c |
| diffstat | 5 files changed, 16 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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 @@ 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;
--- 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 @@ 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
--- 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 @@ 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