X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Ffopen-safer.c;h=9c799223715fd436f8d90b5b729f0f39c0f9e9c9;hb=26c5fd742f9136e2ddbd4695a9172c3fa30ea260;hp=6825f9b9f21b4cc5db2d953b73a183c0f7424618;hpb=196a4d4693a1b50eb309df386dfb5a0f72169d88;p=gnulib.git

diff --git a/lib/fopen-safer.c b/lib/fopen-safer.c
index 6825f9b9f..9c7992237 100644
--- a/lib/fopen-safer.c
+++ b/lib/fopen-safer.c
@@ -1,10 +1,12 @@
 /* Invoke fopen, but avoid some glitches.
-   Copyright (C) 2001 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   Copyright (C) 2001, 2004, 2005, 2006, 2009 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
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,31 +14,17 @@
    GNU General Public License for more details.
 
    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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Written by Paul Eggert.  */
 
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-#include <unistd-safer.h>
+#include <config.h>
 
-#ifndef STDERR_FILENO
-# define STDERR_FILENO 2
-#endif
+#include "stdio-safer.h"
 
 #include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
-
-#include <stdio.h>
-#include <stdio-safer.h>
+#include <unistd.h>
+#include "unistd-safer.h"
 
 /* Like fopen, but do not return stdin, stdout, or stderr.  */