Mercurial > hg > octave-nkf > gnulib-hg
changeset 6150:882f5823cabb
Merge minor changes from coreutils.
author | Jim Meyering <jim@meyering.net> |
---|---|
date | Sat, 27 Aug 2005 20:49:12 +0000 |
parents | 329592c87601 |
children | 5b6765db23e7 |
files | lib/dup-safer.c lib/fd-safer.c lib/fopen-safer.c |
diffstat | 3 files changed, 8 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/lib/dup-safer.c +++ b/lib/dup-safer.c @@ -25,9 +25,7 @@ #include <fcntl.h> -#if HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <unistd.h> #ifndef STDERR_FILENO # define STDERR_FILENO 2 #endif
--- a/lib/fd-safer.c +++ b/lib/fd-safer.c @@ -26,9 +26,7 @@ #include <errno.h> -#if HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <unistd.h> #ifndef STDIN_FILENO # define STDIN_FILENO 0 #endif
--- a/lib/fopen-safer.c +++ b/lib/fopen-safer.c @@ -1,5 +1,5 @@ /* Invoke fopen, but avoid some glitches. - Copyright (C) 2001, 2004 Free Software Foundation, Inc. + Copyright (C) 2001, 2004, 2005 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -21,19 +21,16 @@ # include <config.h> #endif -#if HAVE_UNISTD_H -# include <unistd.h> -#endif -#include <unistd-safer.h> +#include "stdio-safer.h" + +#include <errno.h> +#include <unistd.h> +#include "unistd-safer.h" #ifndef STDERR_FILENO # define STDERR_FILENO 2 #endif -#include <errno.h> -#include <stdio.h> -#include <stdio-safer.h> - /* Like fopen, but do not return stdin, stdout, or stderr. */ FILE *