diff options
| author | Christopher Ferris <cferris@google.com> | 2014-09-06 17:54:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-06 17:54:36 +0000 |
| commit | 7d7367ab18f62a00adf72a7053872ada43e3949a (patch) | |
| tree | 43f13069a965cd18c18d83c21c6379078c3418b3 | |
| parent | 4e5528f8a2787934a2c091ce11c757a44d7ec445 (diff) | |
| parent | e8960dc707b76d83fbf8a650314b93d8c28b1a38 (diff) | |
| download | android_external_dhcpcd-7d7367ab18f62a00adf72a7053872ada43e3949a.tar.gz android_external_dhcpcd-7d7367ab18f62a00adf72a7053872ada43e3949a.tar.bz2 android_external_dhcpcd-7d7367ab18f62a00adf72a7053872ada43e3949a.zip | |
am e8960dc7: Merge "Move check of IFF_LOWER_UP after all includes."
* commit 'e8960dc707b76d83fbf8a650314b93d8c28b1a38':
Move check of IFF_LOWER_UP after all includes.
| -rw-r--r-- | if-linux.c | 16 |
1 files changed, 9 insertions, 7 deletions
@@ -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; |