Remove all S_IS* and S_IF* definitions.

Instead, just include "stat-macros.h".

diff --git a/lib/canonicalize.c b/lib/canonicalize.c
index c1f5aacbb6ccdc89f253688d7f170497d915e2ed..f56d80f22ce7baa0945e3424736755d96ed10d82 100644 (file)
--- a/lib/canonicalize.c
+++ b/lib/canonicalize.c
@@ -76,18 +76,9 @@ extern int errno;
 # endif
 
 # include "pathmax.h"
+# include "stat-macros.h"
 # include "xreadlink.h"
 
-# ifdef STAT_MACROS_BROKEN
-#  undef S_ISLNK
-# endif
-
-# ifndef S_ISLNK
-#  ifdef S_IFLNK
-#   define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)
-#  endif
-# endif
-
 #endif /* !HAVE_RESOLVEPATH */
 
 /* Return the canonical absolute name of file NAME.  A canonical name