X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ffileblocks.c;h=822935af93030a78d5c2dc44a225b75995da3990;hb=38db1b35bf51a7a738f27d2660a9fdd3b46447be;hp=9a10cc222423f568febf9cf2f8edfd6f228fb687;hpb=7c3f8da8f075e3813ced160d5b53a28c6f7dfe78;p=gnulib.git

diff --git a/lib/fileblocks.c b/lib/fileblocks.c
index 9a10cc222..822935af9 100644
--- a/lib/fileblocks.c
+++ b/lib/fileblocks.c
@@ -1,12 +1,12 @@
 /* Convert file size to number of blocks on System V-like machines.
 
-   Copyright (C) 1990, 1997, 1998, 1999, 2004, 2005 Free Software
+   Copyright (C) 1990, 1997, 1998, 1999, 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 Brian L. Matthews, blm@6sceng.UUCP. */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+
+#include <config.h>
 
 #include <sys/types.h>
 
@@ -35,7 +32,7 @@
 
 # ifndef NINDIR
 
-#  if defined (__DJGPP__)
+#  if defined __DJGPP__
 typedef long daddr_t; /* for disk address */
 #  endif