summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2015-01-06 19:56:56 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-06 19:56:56 +0000
commit7ad1c86e985a9ec4479bc3fedbf1546bb66649c7 (patch)
treee35fc18b8e14e348fe530fa7ccb28e3ba13e0e1c /client
parentf823669357e8a5af5fd2958f530bf8bc7be61364 (diff)
parent3dc3e5423a183930fa981fa010f653be03201774 (diff)
downloadandroid_system_netd-7ad1c86e985a9ec4479bc3fedbf1546bb66649c7.tar.gz
android_system_netd-7ad1c86e985a9ec4479bc3fedbf1546bb66649c7.tar.bz2
android_system_netd-7ad1c86e985a9ec4479bc3fedbf1546bb66649c7.zip
am 3dc3e542: am 1a3c689b: Merge "Fix missing errno.h includes after libc cleanup."
* commit '3dc3e5423a183930fa981fa010f653be03201774': Fix missing errno.h includes after libc cleanup.
Diffstat (limited to 'client')
-rw-r--r--client/NetdClient.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/client/NetdClient.cpp b/client/NetdClient.cpp
index fce362e5..0c9d1859 100644
--- a/client/NetdClient.cpp
+++ b/client/NetdClient.cpp
@@ -16,15 +16,17 @@
#include "NetdClient.h"
+#include <errno.h>
+#include <sys/socket.h>
+#include <unistd.h>
+
+#include <atomic>
+
#include "Fwmark.h"
#include "FwmarkClient.h"
#include "FwmarkCommand.h"
#include "resolv_netid.h"
-#include <atomic>
-#include <sys/socket.h>
-#include <unistd.h>
-
namespace {
std::atomic_uint netIdForProcess(NETID_UNSET);