From 6377e850e1e182dc6f5e6a72284e522031c8ee1d Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Mon, 12 Jan 1998 08:13:39 +0000 Subject: [PATCH] Include sys/param.h only #if HAVE_SYS_PARAM_H. Move function-spanning `#if ...BSIZE' stmt to follow inclusion of sys/param.h since BSIZE is sometimes defined in sys/param.h. Based on a patch from Philippe De Muyter. --- lib/fileblocks.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/fileblocks.c b/lib/fileblocks.c index 6a421cf51..47a730898 100644 --- a/lib/fileblocks.c +++ b/lib/fileblocks.c @@ -1,5 +1,5 @@ /* Convert file size to number of blocks on System V-like machines. - Copyright (C) 1990, 1997 Free Software Foundation, Inc. + Copyright (C) 1990, 1997, 1998 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 @@ -21,9 +21,13 @@ # include #endif -#if !HAVE_ST_BLOCKS && !defined _POSIX_SOURCE && defined BSIZE -# include +#include + +#if HAVE_SYS_PARAM_H # include +#endif + +#if !HAVE_ST_BLOCKS && !defined _POSIX_SOURCE && defined BSIZE # if HAVE_UNISTD_H # include @@ -32,7 +36,7 @@ # ifndef NINDIR /* Some SysV's, like Irix, seem to lack this. Hope it's correct. */ /* Number of inode pointers per indirect block. */ -# define NINDIR (BSIZE/sizeof(daddr_t)) +# define NINDIR (BSIZE / sizeof (daddr_t)) # endif /* !NINDIR */ /* Number of direct block addresses in an inode. */ -- 2.11.0