commit 0a049b1d8dbb1877fd9cd3ca7c3f39e72b3b6c04
author Elliott Hughes <enh@google.com> Mon Jan 12 14:26:36 2015 -0800
committer Elliott Hughes <enh@google.com> Mon Jan 12 17:00:09 2015 -0800
tree f4f3dbe476e94f693d45b81f56761c8af88be424
parent ec556521e23f66ea52e41a7d9540b2dec31766c5

Clean up adb Win32 symlink #ifdefs.

Change-Id: I83ef30e82d820f91960c29f6b737e6e900caaca6

adb/file_sync_client.c

diff --git a/adb/file_sync_client.c b/adb/file_sync_client.c
index 7fb3e3b..ee09d5d 100644
--- a/adb/file_sync_client.c
+++ b/adb/file_sync_client.c
@@ -309,7 +309,9 @@
     return err;
 }
 
-#ifdef HAVE_SYMLINKS
+#if defined(_WIN32)
+extern int write_data_link(int fd, const char *path, syncsendbuf *sbuf) __attribute__((error("no symlinks on Windows")));
+#else
 static int write_data_link(int fd, const char *path, syncsendbuf *sbuf)
 {
     int len, ret;
@@ -364,10 +366,8 @@
         free(file_buffer);
     } else if (S_ISREG(mode))
         write_data_file(fd, lpath, sbuf, show_progress);
-#ifdef HAVE_SYMLINKS
     else if (S_ISLNK(mode))
         write_data_link(fd, lpath, sbuf);
-#endif
     else
         goto fail;