From b77d3d724945f38b39f3116e3aead4edcbd08a36 Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Tue, 11 Sep 2012 18:52:40 -0700
Subject: [PATCH] Always include <sys/socket.h> before <linux/netlink.h>.

Newer kernel headers files aren't stand alone. (This has long been true of
glibc's copy, but we only recently updated external/kernel-headers.)

Change-Id: Iebcb40902b2f29fe509e207e2f3a9d02a7e40602
---
 charger/charger.c   | 5 +++--
 libnl_2/genl/genl.c | 1 +
 libnl_2/msg.c       | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/charger/charger.c b/charger/charger.c
index abf551710..76be076df 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 244299327..1e127aff3 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 283da6e94..1303e8ab0 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"