changeset 1567:73eb55d21cde draft

Patch from Elliott Hughes for Android/bionic build.
author Rob Landley <rob@landley.net>
date Fri, 21 Nov 2014 06:42:37 -0600
parents 62a7d617e1ce
children 272bd62cb194
files lib/portability.h
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lib/portability.h	Wed Nov 19 21:38:00 2014 -0600
+++ b/lib/portability.h	Fri Nov 21 06:42:37 2014 -0600
@@ -11,7 +11,10 @@
 
 // This makes it stop.
 
+// Except on Android, where fortify is mandatory.
+#if !defined(__ANDROID__)
 #undef _FORTIFY_SOURCE
+#endif
 
 // For musl
 #define _ALL_SOURCE
@@ -173,7 +176,7 @@
 #define SWAP_LE64(x) (x)
 #endif
 
-#if defined(__APPLE__) || defined(__ANDROID__) \
+#if defined(__APPLE__) \
     || (defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ < 10)
 ssize_t getdelim(char **lineptr, size_t *n, int delim, FILE *stream);
 ssize_t getline(char **lineptr, size_t *n, FILE *stream);