Don't call gnulib's careadlinkat on Windows.

 src/w32.c (careadlinkat, careadlinkatcwd): New always-fail stubs.
 lib/makefile.w32-in ($(BLD)/careadlinkat.$(O), GNULIBOBJS):
 Revert last change.

2 files changed, 27 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 4c852723595..240fd8fb9a7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2011-04-06  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32.c (careadlinkat, careadlinkatcwd): New always-fail stubs.
+
 2011-04-06  Paul Eggert  <eggert@cs.ucla.edu>
 
         Fix more problems found by GCC 4.6.0's static checks.
diff --git a/src/w32.c b/src/w32.c
index da403671115..d715c39fa81 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -138,6 +138,9 @@ typedef struct _PROCESS_MEMORY_COUNTERS_EX {
 #include "dispextern.h"         /* for xstrcasecmp */
 #include "coding.h"             /* for Vlocale_coding_system */
 
+#include "careadlinkat.h"
+#include "allocator.h"
+
 /* For serial_configure and serial_open.  */
 #include "process.h"
 
@@ -3610,8 +3613,8 @@ utime (const char *name, struct utimbuf *times)
 }
 
 
-/* Symlink-related functions that always fail.  Used in fileio.c to
-   avoid #ifdef's.  */
+/* Symlink-related functions that always fail.  Used in fileio.c and in
+   sysdep.c to avoid #ifdef's.  */
 int
 symlink (char const *dummy1, char const *dummy2)
 {
@@ -3628,6 +3631,24 @@ readlink (const char *name, char *dummy1, size_t dummy2)
   return -1;
 }
 
+char *
+careadlinkat (int fd, char const *filename,
+              char *buffer, size_t buffer_size,
+              struct allocator const *alloc,
+              ssize_t (*preadlinkat) (int, char const *, char *, size_t))
+{
+  errno = ENOSYS;
+  return NULL;
+}
+
+ssize_t
+careadlinkatcwd (int fd, char const *filename, char *buffer,
+                 size_t buffer_size)
+{
+  (void) fd;
+  return readlink (filename, buffer, buffer_size);
+}
+
 
 /* Support for browsing other processes and their attributes.  See
    process.c for the Lisp bindings.  */