From: Jim Meyering <jim@meyering.net>
Date: Sun, 12 Oct 2003 07:03:57 +0000 (+0000)
Subject: (copy_internal): Don't #ifdef-out simple uses of
X-Git-Tag: v5.1.0~442
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=498de26ac5799af2c73e607927530bed1ecd02e2;p=thirdparty%2Fcoreutils.git

(copy_internal): Don't #ifdef-out simple uses of
S_ISLNK or S_ISSOCK.  The S_IS* macros are guaranteed to be defined
via system.h.
---

diff --git a/src/copy.c b/src/copy.c
index 283b6952d6..3981f9cc89 100644
--- a/src/copy.c
+++ b/src/copy.c
@@ -1400,10 +1400,7 @@ copy_internal (const char *src_path, const char *dst_path,
     }
   else if (S_ISREG (src_type)
 	   || (x->copy_as_regular && !S_ISDIR (src_type)
-#ifdef S_ISLNK
-	       && !S_ISLNK (src_type)
-#endif
-	       ))
+	       && !S_ISLNK (src_type)))
     {
       copied_as_regular = 1;
       /* POSIX says the permission bits of the source file must be
@@ -1426,10 +1423,7 @@ copy_internal (const char *src_path, const char *dst_path,
   else
 #endif
     if (S_ISBLK (src_type) || S_ISCHR (src_type)
-#ifdef S_ISSOCK
-	|| S_ISSOCK (src_type)
-#endif
-	)
+	|| S_ISSOCK (src_type))
     {
       if (mknod (dst_path, get_dest_mode (x, src_mode), src_sb.st_rdev))
 	{