Mercurial > hg > octave-nkf > gnulib-hg
changeset 11892:26347f7d2cac
Move #ifs inside function.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Mon, 24 Aug 2009 00:34:04 +0200 |
parents | 77de0cfcbcf7 |
children | 476cefda5290 |
files | ChangeLog lib/pipe2.c |
diffstat | 2 files changed, 19 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2009-08-23 Bruno Haible <bruno@clisp.org> + + * lib/pipe2.c (pipe2): Move #ifs inside function. + 2009-08-22 Joel E. Denny <jdenny@clemson.edu> quotearg: document limitations of quote_these_too
--- a/lib/pipe2.c +++ b/lib/pipe2.c @@ -28,9 +28,21 @@ # include <io.h> +#else +/* Unix API. */ + +# ifndef O_CLOEXEC +# define O_CLOEXEC 0 +# endif + +#endif + int pipe2 (int fd[2], int flags) { +#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +/* Native Woe32 API. */ + /* Check the supported flags. */ if ((flags & ~(O_CLOEXEC | O_BINARY | O_TEXT)) != 0) { @@ -39,18 +51,10 @@ } return _pipe (fd, 4096, flags); -} #else /* Unix API. */ -# ifndef O_CLOEXEC -# define O_CLOEXEC 0 -# endif - -int -pipe2 (int fd[2], int flags) -{ /* Check the supported flags. */ if ((flags & ~(O_CLOEXEC | O_NONBLOCK | O_TEXT | O_BINARY)) != 0) { @@ -87,7 +91,7 @@ goto fail; } -#if O_BINARY +# if O_BINARY if (flags & O_BINARY) { setmode (fd[1], O_BINARY); @@ -98,7 +102,7 @@ setmode (fd[1], O_TEXT); setmode (fd[0], O_TEXT); } -#endif +# endif return 0; @@ -110,6 +114,6 @@ errno = saved_errno; return -1; } -} #endif +}