From 0c9f91efb3e5d44a35a9d3559d8070520c55de08 Mon Sep 17 00:00:00 2001 From: Christopher Ferris Date: Wed, 3 Sep 2014 20:17:53 -0700 Subject: Move check of IFF_LOWER_UP after all includes. The latest uapi kernel headers use an enum for values such as IFF_LOWER_UP. This code defines IFF_LOWER_UP and causes the inclusion of if.h later on to mess up the enum definition. Move the IFF_LOWER_UP check after all of the includes. Change-Id: I9d9ce63a63bb6fc82a2424776f5aa6700cc34239 --- if-linux.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) 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 #include #include @@ -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; -- cgit v1.2.3