From: Roy Marples <roy@marples.name>
Date: Tue, 8 Sep 2015 08:33:52 +0000 (+0000)
Subject: Move defines checks after all includes to make Android happy.
X-Git-Tag: v6.9.4~66
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3fb5fabc8287b02e6f2bca4c41395013a5158ca3;p=thirdparty%2Fdhcpcd.git

Move defines checks after all includes to make Android happy.
---

diff --git a/if-linux.c b/if-linux.c
index a28f86eb..2b94b59a 100644
--- a/if-linux.c
+++ b/if-linux.c
@@ -46,18 +46,6 @@
 #include <netinet/in.h>
 #include <net/route.h>
 
-/* Support older kernels */
-#ifndef IFLA_WIRELESS
-# 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 <fcntl.h>
 #include <ctype.h>
@@ -84,6 +72,18 @@
 #endif
 int if_getssid_wext(const char *ifname, uint8_t *ssid);
 
+/* Support older kernels */
+#ifndef IFLA_WIRELESS
+#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
+
 #define bpf_insn		sock_filter
 #define BPF_SKIPTYPE
 #define BPF_ETHCOOK		-ETH_HLEN