changeset 14611:937c80935bc0 v8.1.0319

patch 8.1.0319: bzero() function prototype doesn't work for Android commit https://github.com/vim/vim/commit/8e7218c45941c9f6263348e8eadf6075d0671832 Author: Bram Moolenaar <Bram@vim.org> Date: Wed Aug 22 21:56:57 2018 +0200 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 https://github.com/vim/vim/issues/3365)
author Christian Brabandt <cb@256bit.org>
date Wed, 22 Aug 2018 22:00:07 +0200
parents e6e9a1f2851f
children de8371a98aff
files src/osdef1.h.in src/version.c
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -795,6 +795,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    319,
+/**/
     318,
 /**/
     317,