From 94b96bde9b66a187c66f6c29285a2f540efc04c9 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@musicpd.org>
Date: Thu, 6 Sep 2018 19:33:50 +0200
Subject: [PATCH] util/WStringCompare: wcpcpy() and wcsdup() are available on
 Android

---
 src/util/WStringAPI.hxx | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/util/WStringAPI.hxx b/src/util/WStringAPI.hxx
index 0fd70b72a..160e53420 100644
--- a/src/util/WStringAPI.hxx
+++ b/src/util/WStringAPI.hxx
@@ -108,8 +108,7 @@ gcc_returns_nonnull gcc_nonnull_all
 static inline wchar_t *
 UnsafeCopyStringP(wchar_t *dest, const wchar_t *src) noexcept
 {
-#if defined(_WIN32) || defined(__BIONIC__) || defined(__OpenBSD__) || \
-	defined(__NetBSD__)
+#if defined(_WIN32) || defined(__OpenBSD__) || defined(__NetBSD__)
 	/* emulate wcpcpy() */
 	UnsafeCopyString(dest, src);
 	return dest + StringLength(dest);
@@ -169,8 +168,6 @@ StringIsEqualIgnoreCase(const wchar_t *a, const wchar_t *b,
 
 #endif
 
-#ifndef __BIONIC__
-
 gcc_malloc gcc_returns_nonnull gcc_nonnull_all
 static inline wchar_t *
 DuplicateString(const wchar_t *p)
@@ -183,5 +180,3 @@ DuplicateString(const wchar_t *p)
 }
 
 #endif
-
-#endif