am 57cf78d0: am 3ef3c85a: am e0988b4b: am 8ee8b362: am c8cd001c: am 18ccfeaf: am ddde5cb3: am ab760879: Fun with buffer overrruns.
* commit '57cf78d09a98b4a2952d7542528570bd40f31347':
Fun with buffer overrruns.
diff --git a/Android.mk b/Android.mk
index 216ee3a..1ee3230 100644
--- a/Android.mk
+++ b/Android.mk
@@ -11,6 +11,8 @@
if-linux.c if-linux-wireless.c lpf.c \
platform-linux.c compat/closefrom.c ifaddrs.c ipv6rs.c
+# Clang complains about configure.c's comparing array with null.
+LOCAL_CFLAGS += -Wno-tautological-pointer-compare
LOCAL_SHARED_LIBRARIES := libc libcutils libnetutils
LOCAL_MODULE = dhcpcd
include $(BUILD_EXECUTABLE)
diff --git a/NOTICE b/NOTICE
index 69987c8..73598aa 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
dhcpcd - DHCP client daemon
-Copyright 2006-2008 Roy Marples <roy@marples.name>
+Copyright (c) 2006-2012 Roy Marples <roy@marples.name>
All rights reserved
Redistribution and use in source and binary forms, with or without
diff --git a/if-linux.c b/if-linux.c
index 9355359..3d0bcad 100644
--- a/if-linux.c
+++ b/if-linux.c
@@ -40,13 +40,6 @@
# define IFLA_WIRELESS (IFLA_MASTER + 1)
#endif
-/* For some reason, glibc doesn't include newer flags from linux/if.h
- * However, we cannot include linux/if.h directly as it conflicts
- * with the glibc version. D'oh! */
-#ifndef IFF_LOWER_UP
-#define IFF_LOWER_UP 0x10000 /* driver signals L1 up */
-#endif
-
#include <errno.h>
#include <ctype.h>
#include <stddef.h>
@@ -61,6 +54,15 @@
#include "dhcp.h"
#include "net.h"
+/* ANDROID change, moved this below all includes. */
+/* For some reason, glibc doesn't include newer flags from linux/if.h
+ * However, we cannot include linux/if.h directly as it conflicts
+ * with the glibc version. D'oh! */
+#ifndef IFF_LOWER_UP
+#define IFF_LOWER_UP 0x10000 /* driver signals L1 up */
+#endif
+/* End of ANDROID change */
+
static int sock_fd;
static struct sockaddr_nl sock_nl;
