diff options
| author | Elliott Hughes <enh@google.com> | 2012-09-12 11:08:42 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-12 11:08:42 -0700 |
| commit | 7e014ce6defdfe596d83ff549a13f7215151069e (patch) | |
| tree | 1410d1378c931ac601b6db5fae26f1dfe7bf9ee6 /charger | |
| parent | 0f5e303c6a88c63fc5a4d325ab675af7ed57b777 (diff) | |
| parent | cdc4a400b3a47564887ac1220bfb7f6f8312a71e (diff) | |
| download | system_core-7e014ce6defdfe596d83ff549a13f7215151069e.tar.gz system_core-7e014ce6defdfe596d83ff549a13f7215151069e.tar.bz2 system_core-7e014ce6defdfe596d83ff549a13f7215151069e.zip | |
am cdc4a400: am cb71ed30: am 50e2555d: Merge "Always include <sys/socket.h> before <linux/netlink.h>."
* commit 'cdc4a400b3a47564887ac1220bfb7f6f8312a71e':
Always include <sys/socket.h> before <linux/netlink.h>.
Diffstat (limited to 'charger')
| -rw-r--r-- | charger/charger.c | 5 |
1 files changed, 3 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> |