From 6a29bb1ebe62ada2dad5fb50f84f23a497cd677a Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Fri, 21 Nov 2014 21:49:05 -0600
Subject: A patch against your current ToT that builds in AOSP master.

---
 lib/portability.c | 14 +-------------
 lib/portability.h |  3 ---
 2 files changed, 1 insertion(+), 16 deletions(-)

(limited to 'lib')

diff --git a/lib/portability.c b/lib/portability.c
index 17efc916..910b1ea9 100644
--- a/lib/portability.c
+++ b/lib/portability.c
@@ -5,11 +5,8 @@
  */
 
 #include "toys.h"
-#if defined(__ANDROID__)
-#include <sys/syscall.h>
-#endif
 
-#if defined(__APPLE__) || defined(__ANDROID__)
+#if defined(__APPLE__)
 ssize_t getdelim(char **linep, size_t *np, int delim, FILE *stream)
 {
   int ch;
@@ -62,16 +59,7 @@ ssize_t getline(char **linep, size_t *np, FILE *stream)
 {
   return getdelim(linep, np, '\n', stream);
 }
-#endif
-
-#if defined(__ANDROID__)
-int sethostname(const char *name, size_t len)
-{
-  return syscall(__NR_sethostname, name, len);
-}
-#endif
 
-#if defined(__APPLE__)
 extern char **environ;
 
 int clearenv(void)
diff --git a/lib/portability.h b/lib/portability.h
index 548c128f..2f2421d8 100644
--- a/lib/portability.h
+++ b/lib/portability.h
@@ -187,9 +187,6 @@ ssize_t getline(char **lineptr, size_t *n, FILE *stream);
 #include <sys/swap.h>
 
 // Android is missing some headers and functions
-#if defined(__ANDROID__)
-int sethostname(const char *name, size_t len);
-#endif
 // "generated/config.h" is included first
 #if CFG_TOYBOX_SHADOW
 #include <shadow.h>
-- 
cgit v1.2.3