patch 8.1.0319: bzero() function prototype doesn't work for Android

Problem:    bzero() function prototype doesn't work for Android.
Solution:   Add an #ifdef. (Elliott Hughes, closes #3365)

diff --git a/src/osdef1.h.in b/src/osdef1.h.in
index 5519104c93e6556cba8d7e0a79b712e9238c9c10..825fe94d36612aa7ab5abb8adc0f157ec49a0465 100644 (file)
--- a/src/osdef1.h.in
+++ b/src/osdef1.h.in
@@ -65,8 +65,10 @@ extern void  memmove(char *, char *, int);
 #  endif
 # endif
 #endif
-/* used inside of FD_ZERO macro: */
+#ifndef __BIONIC__  // Android's libc #defines bzero to memset.
+// used inside of FD_ZERO macro
 extern void    bzero(void *, size_t);
+#endif
 #ifdef HAVE_SETSID
 extern pid_t   setsid(void);
 #endif

diff --git a/src/version.c b/src/version.c
index 1afe230cfb379c4847d17d49d8dd355006dc35e8..0c3f87c080d3157f98ff2e55b1a492b97341010a 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -794,6 +794,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    319,
 /**/
     318,
 /**/