commit 0d5c1a7745a287dd6f09133824f6426ce8b280be
author Josh Gao <jmgao@google.com> Thu Nov 17 21:59:57 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Nov 17 21:59:57 2016 +0000
tree 1027837549a0320719425d59d14fd67dc57535d0
parent 4775e669966b820a33d32a0d578be825511f8bf9
parent 1ceca95f8e4adf555307a57719338272f622a090

adb: actually fix the windows build. am: 58eda35ace am: bbd6d7b3e7
am: 1ceca95f8e

Change-Id: I1c8c386d69b3528a9be8f1b2c0032ed04363a228

adb/sockets.c

diff --git a/adb/sockets.c b/adb/sockets.c
index cf8baed0..7cf7784 100644
--- a/adb/sockets.c
+++ b/adb/sockets.c
@@ -30,6 +30,11 @@
 #define  TRACE_TAG  TRACE_SOCKETS
 #include "adb.h"
 
+#if defined(_WIN32)
+#define pthread_mutex_lock(...) abort()
+#define pthread_mutex_unlock(...) abort()
+#else
+#include <pthread.h>
 static pthread_mutex_t socket_list_lock;
 static void __attribute__((constructor)) socket_list_lock_init(void) {
   pthread_mutexattr_t attr;
@@ -37,6 +42,7 @@
   pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
   pthread_mutex_init(&socket_list_lock, &attr);
 }
+#endif
 
 int sendfailmsg(int fd, const char *reason)
 {