From d20a11f236b57fe515ce4dbb37e0300d7ba179b5 Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Fri, 14 Sep 2018 09:54:45 -0700
Subject: Fix glibc build after 013876f067a11ebfcf47789921b376e7bf3bf5b8.

/usr/include/unistd.h:626:15: error: conflicting types for 'confstr'
---
 lib/portability.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/portability.h b/lib/portability.h
index 0404c85e..8e1049f9 100644
--- a/lib/portability.h
+++ b/lib/portability.h
@@ -257,8 +257,8 @@ extern CODE prioritynames[], facilitynames[];
 #endif
 void xgetrandom(void *buf, unsigned len, unsigned flags);
 
-// android NDK doesn't have confstr
-#ifndef _CS_PATH
+// Android's bionic libc doesn't have confstr.
+#ifdef __BIONIC__
 #define _CS_PATH	0
 #define _CS_V7_ENV	1
 #include <string.h>
-- 
cgit v1.2.3