diff options
| -rw-r--r-- | src/osdef1.h.in | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/osdef1.h.in b/src/osdef1.h.in index 5519104c9..825fe94d3 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 1afe230cf..0c3f87c08 100644 --- 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, |