diff options
| author | Jim Meyering <jim@meyering.net> | 2005-08-27 20:49:12 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2005-08-27 20:49:12 +0000 |
| commit | 794b55ff3dcebba4518b555161f97ef6524a7270 (patch) | |
| tree | 3e8a3fc95d816b94816f86b30ec42d33399b6efa /lib/fopen-safer.c | |
| parent | 370bea79556d39ce78ebfb8146031348466e2421 (diff) | |
| download | gnulib-794b55ff3dcebba4518b555161f97ef6524a7270.tar.gz | |
Merge minor changes from coreutils.
Diffstat (limited to 'lib/fopen-safer.c')
| -rw-r--r-- | lib/fopen-safer.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/lib/fopen-safer.c b/lib/fopen-safer.c index 1eb594b32f..ccaf1219f0 100644 --- 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 * |