X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Ffileblocks.c;h=4024d1ef24ff1b690e242862e37720141fe79918;hb=a9e638f0e4d6928c12f2b374bc369bb1ecf2cdfe;hp=1a44516f3d0fb2a61af0bab5be00f22a6ae378df;hpb=cf42d3e5e80be6bf7093a3ca9be0d04033eaf527;p=gnulib.git

diff --git a/lib/fileblocks.c b/lib/fileblocks.c
index 1a44516f3..4024d1ef2 100644
--- a/lib/fileblocks.c
+++ b/lib/fileblocks.c
@@ -1,5 +1,7 @@
 /* Convert file size to number of blocks on System V-like machines.
-   Copyright (C) 1990, 1997, 1998 Free Software Foundation, Inc.
+
+   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
    it under the terms of the GNU General Public License as published by
@@ -13,13 +15,11 @@
 
    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 Brian L. Matthews, blm@6sceng.UUCP. */
-
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
+
+#include <config.h>
 
 #include <sys/types.h>
 
@@ -27,15 +27,13 @@
 # include <sys/param.h>
 #endif
 
-#if !HAVE_ST_BLOCKS && !defined _POSIX_SOURCE && defined BSIZE
+#if !HAVE_STRUCT_STAT_ST_BLOCKS && !defined _POSIX_SOURCE && defined BSIZE
 
-# if HAVE_UNISTD_H
-#  include <unistd.h>
-# endif
+# include <unistd.h>
 
 # ifndef NINDIR
 
-#  if defined (__DJGPP__)
+#  if defined __DJGPP__
 typedef long daddr_t; /* for disk address */
 #  endif
 
@@ -73,5 +71,5 @@ st_blocks (off_t size)
 #else
 /* This declaration is solely to ensure that after preprocessing
    this file is never empty.  */
-extern int textutils_fileblocks_unused;
+typedef int textutils_fileblocks_unused;
 #endif