From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 22 Aug 2018 19:56:57 +0000 (+0200)
Subject: patch 8.1.0319: bzero() function prototype doesn't work for Android
X-Git-Tag: v8.1.0319
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=8e7218c45941c9f6263348e8eadf6075d0671832;p=thirdparty%2Fvim.git

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 5519104c93..825fe94d36 100644
--- 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 1afe230cfb..0c3f87c080 100644
--- 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,
 /**/