Permalink
Browse files

am cdc4a40: am cb71ed3: am 50e2555: Merge "Always include <sys/socket…

….h> before <linux/netlink.h>."

* commit 'cdc4a400b3a47564887ac1220bfb7f6f8312a71e':
  Always include <sys/socket.h> before <linux/netlink.h>.
  • Loading branch information...
2 parents 0f5e303 + cdc4a40 commit 7e014ce6defdfe596d83ff549a13f7215151069e @enh enh committed with Android Git Automerger Sep 12, 2012
Showing with 5 additions and 2 deletions.
  1. +3 −2 charger/charger.c
  2. +1 −0 libnl_2/genl/genl.c
  3. +1 −0 libnl_2/msg.c
View
@@ -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>
View
@@ -20,6 +20,7 @@
#include <unistd.h>
#include <stdio.h>
#include <sys/time.h>
+#include <sys/socket.h>
#include <linux/netlink.h>
#include <netlink/genl/ctrl.h>
#include <netlink/genl/family.h>
View
@@ -18,6 +18,7 @@
#include <malloc.h>
#include <unistd.h>
+#include <sys/socket.h>
#include <linux/netlink.h>
#include "netlink-types.h"

0 comments on commit 7e014ce

Please sign in to comment.