From: Jim Meyering <jim@meyering.net>
Date: Sat, 19 Jun 2004 12:25:31 +0000 (+0000)
Subject: Remove all S_IS* and S_IF* definitions.
X-Git-Tag: v5.3.0~1311
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8836ff8b3ca95c312d0b8a69333575f246568e9e;p=thirdparty%2Fcoreutils.git

Remove all S_IS* and S_IF* definitions.
Instead, just include "stat-macros.h".
---

diff --git a/lib/rmdir.c b/lib/rmdir.c
index 5315711c32..55fee53c03 100644
--- a/lib/rmdir.c
+++ b/lib/rmdir.c
@@ -1,6 +1,6 @@
 /* BSD compatible remove directory function for System V
 
-   Copyright (C) 1988, 1990, 1999, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1990, 1999, 2003, 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
@@ -28,13 +28,7 @@
 extern int errno;
 #endif
 
-#if STAT_MACROS_BROKEN
-# undef S_ISDIR
-#endif
-
-#if !defined(S_ISDIR) && defined(S_IFDIR)
-# define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
-#endif
+#include "stat-macros.h"
 
 /* rmdir adapted from GNU tar.  */