X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ffileblocks.c;h=72e78a5e1734a6915cd781ef694e16557f0d571e;hb=5bc7f527b9e5cd3789419d04e14fd8534ef396d4;hp=e94d903b0326b1f880fae8c11ba867d6a1404b1c;hpb=4ba0abaf65e1efb2b5808bb3b222b2fb48b32635;p=gnulib.git diff --git a/lib/fileblocks.c b/lib/fileblocks.c index e94d903b0..72e78a5e1 100644 --- a/lib/fileblocks.c +++ b/lib/fileblocks.c @@ -1,5 +1,6 @@ /* 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 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 @@ -17,7 +18,7 @@ /* Written by Brian L. Matthews, blm@6sceng.UUCP. */ -#ifdef HAVE_CONFIG_H +#if HAVE_CONFIG_H # include #endif @@ -27,7 +28,7 @@ # include #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 @@ -50,8 +51,7 @@ typedef long daddr_t; /* for disk address */ /* Return the number of 512-byte blocks in a file of SIZE bytes. */ off_t -st_blocks (size) - off_t size; +st_blocks (off_t size) { off_t datablks = size / 512 + (size % 512 != 0); off_t indrblks = 0; @@ -74,5 +74,5 @@ st_blocks (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