commit 2d8f9b5aea90b57cd01c0a07cfff032092b4672e
author Yabin Cui <yabinc@google.com> Mon Feb 09 13:58:28 2015 -0800
committer Yabin Cui <yabinc@google.com> Mon Feb 09 19:56:47 2015 -0800
tree 5e0c6af872e20d46e99e1b47a6378360915b70bf
parent a4fc89badf4ef4d42df0927340c6f0d02167a3d6

Define MAXHOSTNAMELEN explicitly in source files.

Bug: 19093777
Bug: 19092844
Change-Id: I0778507ca2d5c008abb9a6d6315d0909263a8817

libc/kernel/tools/defaults.py

diff --git a/libc/kernel/tools/defaults.py b/libc/kernel/tools/defaults.py
index 2efd455..8aba998 100644
--- a/libc/kernel/tools/defaults.py
+++ b/libc/kernel/tools/defaults.py
@@ -118,10 +118,8 @@
 # the generated files.
 #
 kernel_ignored_macros = set(
-        [ "MAXHOSTNAMELEN",  # for some reason, Linux defines it to 64
-                             # while most of the BSD code expects this to be 256
-                             # so ignore the kernel-provided definition and
-                             # define it in the Bionic headers instead
+        [
+
         ]
     )
 

libc/kernel/uapi/asm-generic/param.h

diff --git a/libc/kernel/uapi/asm-generic/param.h b/libc/kernel/uapi/asm-generic/param.h
index aa21864..6bde154 100644
--- a/libc/kernel/uapi/asm-generic/param.h
+++ b/libc/kernel/uapi/asm-generic/param.h
@@ -29,5 +29,6 @@
 #ifndef NOGROUP
 #define NOGROUP (- 1)
 #endif
-#endif
+#define MAXHOSTNAMELEN 64
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#endif