From 5430b706406aa3fef25395f021fc000dc1b302a6 Mon Sep 17 00:00:00 2001
From: Andrew Bettison <andrewb@zip.com.au>
Date: Tue, 26 Feb 2013 11:34:41 +1030
Subject: [PATCH] Fix Android build with latest bcopy/bzero changes

---
 Android.mk |  1 +
 os.c       | 12 ------------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/Android.mk b/Android.mk
index 1cce781f..a2982830 100644
--- a/Android.mk
+++ b/Android.mk
@@ -17,6 +17,7 @@ SERVALD_LOCAL_CFLAGS = \
         -DHAVE_SYS_MMAN_H=1 -DHAVE_SYS_TIME_H=1 -DHAVE_POLL_H=1 -DHAVE_NETDB_H=1 \
 	-DHAVE_JNI_H=1 -DHAVE_STRUCT_UCRED=1 -DHAVE_CRYPTO_SIGN_NACL_GE25519_H=1 \
         -DBYTE_ORDER=_BYTE_ORDER -DHAVE_LINUX_STRUCT_UCRED \
+        -DHAVE_BCOPY -DHAVE_BZERO \
 	-I$(NACL_INC) \
 	-I$(SQLITE3_INC)
 
diff --git a/os.c b/os.c
index 769ea99b..555008bb 100644
--- a/os.c
+++ b/os.c
@@ -30,18 +30,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <time.h>
 #include <string.h>
 
-#ifndef HAVE_BZERO
-__SERVALDNA_OS_INLINE void bzero(void *buf, size_t len) {
-    memset(buf, 0, len);
-}
-#endif
-
-#ifndef HAVE_BCOPY
-__SERVALDNA_OS_INLINE void bcopy(void *src, void *dst, size_t len) {
-    memcpy(dst, src, len);
-}
-#endif
-
 int mkdirs(const char *path, mode_t mode)
 {
   return mkdirsn(path, strlen(path), mode);