Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4deee74e authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am f135a447: am 7e014ce6: am cdc4a400: am cb71ed30: am 50e2555d: Merge "Always...

am f135a447: am 7e014ce6: am cdc4a400: am cb71ed30: am 50e2555d: Merge "Always include <sys/socket.h> before <linux/netlink.h>."

* commit 'f135a447':
  Always include <sys/socket.h> before <linux/netlink.h>.
parents 2aebf3d4 f135a447
Loading
Loading
Loading
Loading
+3 −2
Original line number Original line Diff line number Diff line
@@ -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>
+1 −0
Original line number Original line Diff line number Diff line
@@ -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/genl/ctrl.h>
#include <netlink/genl/ctrl.h>
#include <netlink/genl/family.h>
#include <netlink/genl/family.h>
+1 −0
Original line number Original line Diff line number Diff line
@@ -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"