X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ffopen-safer.c;h=ccaf1219f0446683eedbc2d1ccf1affc9db9c072;hb=7ec881d86b09cad88b3999ee314c21abe78c7eb2;hp=c5c97c8a19ab7eb8f50f02c42355a61e41299183;hpb=a62be9f4039b4499cfbb76e394cad2259d03fa84;p=gnulib.git

diff --git a/lib/fopen-safer.c b/lib/fopen-safer.c
index c5c97c8a1..ccaf1219f 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
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Paul Eggert.  */
 
@@ -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 *