X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ffile-type.c;h=5a2bf7c68d8fdd2d77ab4b6e0b6275fb3984e044;hb=8d53196a5a3408315e6ed3410973d3bd16a8a3e9;hp=4b811903f0e9f97968d9a2720f1ced16e6f251d5;hpb=222b0486b7db1b09293e05512873d633440efcb3;p=gnulib.git

diff --git a/lib/file-type.c b/lib/file-type.c
index 4b811903f..5a2bf7c68 100644
--- a/lib/file-type.c
+++ b/lib/file-type.c
@@ -1,12 +1,12 @@
 /* Return a string describing the type of a file.
 
-   Copyright (C) 1993, 1994, 2001, 2002, 2004, 2005 Free Software
+   Copyright (C) 1993-1994, 2001-2002, 2004-2006, 2009-2010 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,19 +14,14 @@
    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 Paul Eggert.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "file-type.h"
 
-#include "stat-macros.h"
-
 #include <gettext.h>
 #define _(text) gettext (text)