commit 5231aff7bb041341527274c9e628c8e854cd07c0
author Pirama Arumuga Nainar <pirama@google.com> Wed Aug 08 10:33:24 2018 -0700
committer Pirama Arumuga Nainar <pirama@google.com> Fri Sep 21 10:46:25 2018 -0700
tree d1226fff1a5d5b6cc70127b7cac145a7f71bd080
parent 075a6b68d8352c75f8ef60a44738d83da52b1b58

Adapt to switch to libc++ for Windows

Bug: http://b/91353691

- libcxx has ETXTBSY for Windows
- adb/sysdeps/memory.h is no longer needed

Test: Build and test Windows binaries under Wine.

Change-Id: I9c27087d46c49cb25b391c4adae8d9e24724784d

sysdeps_win32.cpp

diff --git a/sysdeps_win32.cpp b/sysdeps_win32.cpp
index 026dd1c..38cdb57 100644
--- a/sysdeps_win32.cpp
+++ b/sysdeps_win32.cpp
@@ -95,6 +95,10 @@
     _fh_socket_writev,
 };
 
+#if defined(assert)
+#undef assert
+#endif
+
 #define assert(cond)                                                                       \
     do {                                                                                   \
         if (!(cond)) fatal("assertion failed '%s' on %s:%d\n", #cond, __FILE__, __LINE__); \