Merge "Always include <sys/socket.h> before <linux/netlink.h>."

This commit is contained in:
Elliott Hughes 2012-09-12 10:25:15 -07:00 committed by android code review
commit 50e2555d6c
3 changed files with 5 additions and 2 deletions

View file

@ -21,19 +21,20 @@
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <linux/input.h> #include <linux/input.h>
#include <linux/netlink.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <sys/poll.h> #include <sys/poll.h>
#include <sys/socket.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/un.h> #include <sys/un.h>
#include <time.h> #include <time.h>
#include <unistd.h> #include <unistd.h>
#include <sys/socket.h>
#include <linux/netlink.h>
#include <cutils/android_reboot.h> #include <cutils/android_reboot.h>
#include <cutils/klog.h> #include <cutils/klog.h>
#include <cutils/list.h> #include <cutils/list.h>

View file

@ -20,6 +20,7 @@
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>
#include <sys/time.h> #include <sys/time.h>
#include <sys/socket.h>
#include <linux/netlink.h> #include <linux/netlink.h>
#include "netlink-types.h" #include "netlink-types.h"

View file

@ -18,6 +18,7 @@
#include <malloc.h> #include <malloc.h>
#include <unistd.h> #include <unistd.h>
#include <sys/socket.h>
#include <linux/netlink.h> #include <linux/netlink.h>
#include "netlink-types.h" #include "netlink-types.h"