X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Flstat.c;h=9dcb4cdc5bfce3d0b05c15e6a0e83dde19b5c195;hb=4cd8485e904c1a98470eb548fe6ac0f04e343c4e;hp=9b9c33e415d9f015cf87d4e288a15e9f7ed5f943;hpb=28fe652e06a47bc9d02812968dc8c188e5d68593;p=gnulib.git

diff --git a/lib/lstat.c b/lib/lstat.c
index 9b9c33e41..9dcb4cdc5 100644
--- a/lib/lstat.c
+++ b/lib/lstat.c
@@ -3,10 +3,10 @@
    Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free
    Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   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
@@ -14,14 +14,11 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* written by Jim Meyering */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* The specification of these functions is in sys_stat.h.  But we cannot
    include this include file here, because on some systems, a
@@ -33,8 +30,6 @@
 #include <string.h>
 #include <errno.h>
 
-#include "stat-macros.h"
-
 /* lstat works differently on Linux and Solaris systems.  POSIX (see
    `pathname resolution' in the glossary) requires that programs like
    `ls' take into consideration the fact that FILE has a trailing slash