Test HAVE_READLINK instead of S_ISLNK.

diff --git a/ChangeLog b/ChangeLog
index 778f87ba0a16844221af40cae6d4409e14eaee7e..a00a191d2b600783b90e4ac22475c8bf56ba5c18 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-12-23  Bruno Haible  <bruno@clisp.org>
+
+       * lib/canonicalize-lgpl.c (__realpath): Test HAVE_READLINK instead of
+       S_ISLNK.
+       Needed because gnulib's sys/stat.h replacement defines S_ISLNK on
+       mingw.
+
 2006-12-22  Bruno Haible  <bruno@clisp.org>
 
        * lib/copy-file.c: Include acl.h.

diff --git a/lib/canonicalize-lgpl.c b/lib/canonicalize-lgpl.c
index 7da120680d581534d89300862c74ea368c81b512..05ced1103b07bec32a29752e03dc55d7eb69b617 100644 (file)
--- a/lib/canonicalize-lgpl.c
+++ b/lib/canonicalize-lgpl.c
@@ -101,7 +101,7 @@ __realpath (const char *name, char *resolved)
   char *rpath, *dest, *extra_buf = NULL;
   const char *start, *end, *rpath_limit;
   long int path_max;
-#ifdef S_ISLNK
+#if HAVE_READLINK
   int num_links = 0;
 #endif
 
@@ -231,7 +231,7 @@ __realpath (const char *name, char *resolved)
 #endif
            goto error;
 
-#ifdef S_ISLNK
+#if HAVE_READLINK
          if (S_ISLNK (st.st_mode))
            {
              char *buf;