diff options
| author | Elliott Hughes <enh@google.com> | 2012-09-12 11:06:49 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-12 11:06:49 -0700 |
| commit | cdc4a400b3a47564887ac1220bfb7f6f8312a71e (patch) | |
| tree | 1d507f25cf3d12bfec02d96c38ca208c39240fde | |
| parent | e6b898106c7c6f42529db185481d1d4805e91aff (diff) | |
| parent | cb71ed3092cef3b1c56d8d873788daea82de7879 (diff) | |
| download | system_core-cdc4a400b3a47564887ac1220bfb7f6f8312a71e.tar.gz system_core-cdc4a400b3a47564887ac1220bfb7f6f8312a71e.tar.bz2 system_core-cdc4a400b3a47564887ac1220bfb7f6f8312a71e.zip | |
am cb71ed30: am 50e2555d: Merge "Always include <sys/socket.h> before <linux/netlink.h>."
* commit 'cb71ed3092cef3b1c56d8d873788daea82de7879':
Always include <sys/socket.h> before <linux/netlink.h>.
| -rw-r--r-- | charger/charger.c | 5 | ||||
| -rw-r--r-- | libnl_2/genl/genl.c | 1 | ||||
| -rw-r--r-- | libnl_2/msg.c | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/charger/charger.c b/charger/charger.c index abf55171..76be076d 100644 --- a/charger/charger.c +++ b/charger/charger.c @@ -21,19 +21,20 @@ #include <errno.h> #include <fcntl.h> #include <linux/input.h> -#include <linux/netlink.h> #include <stdbool.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <sys/poll.h> -#include <sys/socket.h> #include <sys/stat.h> #include <sys/types.h> #include <sys/un.h> #include <time.h> #include <unistd.h> +#include <sys/socket.h> +#include <linux/netlink.h> + #include <cutils/android_reboot.h> #include <cutils/klog.h> #include <cutils/list.h> diff --git a/libnl_2/genl/genl.c b/libnl_2/genl/genl.c index 24429932..1e127aff 100644 --- a/libnl_2/genl/genl.c +++ b/libnl_2/genl/genl.c @@ -20,6 +20,7 @@ #include <unistd.h> #include <stdio.h> #include <sys/time.h> +#include <sys/socket.h> #include <linux/netlink.h> #include "netlink-types.h" diff --git a/libnl_2/msg.c b/libnl_2/msg.c index 283da6e9..1303e8ab 100644 --- a/libnl_2/msg.c +++ b/libnl_2/msg.c @@ -18,6 +18,7 @@ #include <malloc.h> #include <unistd.h> +#include <sys/socket.h> #include <linux/netlink.h> #include "netlink-types.h" |