# HG changeset patch # User Christian Brabandt # Date 1534968007 -7200 # Node ID 937c80935bc0a907b570712bc9317eb28bef7417 # Parent e6e9a1f2851f9444a0b2777bc54562cf1bc140bb patch 8.1.0319: bzero() function prototype doesn't work for Android commit https://github.com/vim/vim/commit/8e7218c45941c9f6263348e8eadf6075d0671832 Author: Bram Moolenaar 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) diff --git a/src/osdef1.h.in b/src/osdef1.h.in --- 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 --- 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,