diff options
| author | Jim Meyering <jim@meyering.net> | 1998-01-12 08:13:39 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 1998-01-12 08:13:39 +0000 |
| commit | 443f852f613a92d8393105f15c8b6ee3e9b262df (patch) | |
| tree | a1049ba1d51b6a266040058402c5b0ce4b83ccbf /lib | |
| parent | d1f4e617b58fda2ab9f58bceac1f33dfc19820b6 (diff) | |
| download | coreutils-443f852f613a92d8393105f15c8b6ee3e9b262df.tar.xz | |
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.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/fileblocks.c | 12 |
1 files 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 <config.h> #endif -#if !HAVE_ST_BLOCKS && !defined _POSIX_SOURCE && defined BSIZE -# include <sys/types.h> +#include <sys/types.h> + +#if HAVE_SYS_PARAM_H # include <sys/param.h> +#endif + +#if !HAVE_ST_BLOCKS && !defined _POSIX_SOURCE && defined BSIZE # if HAVE_UNISTD_H # include <unistd.h> @@ -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. */ |