From: Jim Meyering <jim@meyering.net>
Date: Fri, 5 Nov 1999 09:55:24 +0000 (+0000)
Subject: Use HAVE_STRUCT_STAT_ST_BLOCKS, not deprecated HAVE_ST_BLOCKS.
X-Git-Tag: FILEUTILS-4_0j-trial~85
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6b32b53027a59eee3818091f629d3aa9feb595e4;p=thirdparty%2Fcoreutils.git

Use HAVE_STRUCT_STAT_ST_BLOCKS, not deprecated HAVE_ST_BLOCKS.
---

diff --git a/lib/fileblocks.c b/lib/fileblocks.c
index 1a44516f3d..2c944307d7 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, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1997, 1998, 1999 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
@@ -27,7 +27,7 @@
 # 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>
diff --git a/src/copy.c b/src/copy.c
index d40dc1901c..e06acc14a7 100644
--- a/src/copy.c
+++ b/src/copy.c
@@ -215,7 +215,7 @@ copy_reg (const char *src_path, const char *dst_path,
 
   buf_size = ST_BLKSIZE (sb);
 
-#if HAVE_ST_BLOCKS
+#if HAVE_STRUCT_STAT_ST_BLOCKS
   if (sparse_mode == SPARSE_AUTO && S_ISREG (sb.st_mode))
     {
       /* Use a heuristic to determine whether SRC_PATH contains any
diff --git a/src/system.h b/src/system.h
index 58b378289a..4e2be1d46d 100644
--- a/src/system.h
+++ b/src/system.h
@@ -311,14 +311,14 @@ extern int errno;
    ST_BLKSIZE: Preferred I/O blocksize for the file, in bytes.
    ST_NBLOCKS: Number of blocks in the file, including indirect blocks.
    ST_NBLOCKSIZE: Size of blocks used when calculating ST_NBLOCKS.  */
-#ifndef HAVE_ST_BLOCKS
+#ifndef HAVE_STRUCT_STAT_ST_BLOCKS
 # define ST_BLKSIZE(statbuf) DEV_BSIZE
 # if defined(_POSIX_SOURCE) || !defined(BSIZE) /* fileblocks.c uses BSIZE.  */
 #  define ST_NBLOCKS(statbuf) ((statbuf).st_size / ST_NBLOCKSIZE + ((statbuf).st_size % ST_NBLOCKSIZE != 0))
 # else /* !_POSIX_SOURCE && BSIZE */
 #  define ST_NBLOCKS(statbuf) (st_blocks ((statbuf).st_size))
 # endif /* !_POSIX_SOURCE && BSIZE */
-#else /* HAVE_ST_BLOCKS */
+#else /* HAVE_STRUCT_STAT_ST_BLOCKS */
 /* Some systems, like Sequents, return st_blksize of 0 on pipes. */
 # define ST_BLKSIZE(statbuf) ((statbuf).st_blksize > 0 \
 			       ? (statbuf).st_blksize : DEV_BSIZE)
@@ -336,7 +336,7 @@ extern int errno;
 #   endif /* _CRAY */
 #  endif /* not AIX PS/2 */
 # endif /* !hpux */
-#endif /* HAVE_ST_BLOCKS */
+#endif /* HAVE_STRUCT_STAT_ST_BLOCKS */
 
 #ifndef ST_NBLOCKS
 # define ST_NBLOCKS(statbuf) ((statbuf).st_blocks)