OSDN Git Service

Fix missing errno.h includes after libc cleanup.
authorDan Albert <danalbert@google.com>
Tue, 6 Jan 2015 17:36:17 +0000 (09:36 -0800)
committerDan Albert <danalbert@google.com>
Tue, 6 Jan 2015 17:36:17 +0000 (09:36 -0800)
These issues hadn't been found yet because a libc++ header was
unconditionally pulling in errno.h. I've fixed the libc++ header now.

Change-Id: Ib096634cdd231fc75bf7548e4b99babc7442dc53

client/NetdClient.cpp
server/InterfaceController.cpp
server/NetdConstants.cpp
server/RouteController.cpp

index fce362e..0c9d185 100644 (file)
 
 #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);
index 061060f..14f0da7 100644 (file)
@@ -15,6 +15,7 @@
  */
 
 #include <dirent.h>
+#include <errno.h>
 
 #define LOG_TAG "InterfaceController"
 #include <cutils/log.h>
index 4823c91..8423fd6 100644 (file)
  * limitations under the License.
  */
 
+#include <ctype.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <netdb.h>
+#include <net/if.h>
 #include <netinet/in.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/wait.h>
-#include <ctype.h>
-#include <net/if.h>
 
 #define LOG_TAG "Netd"
 
index 140c0d3..4cb145b 100644 (file)
 
 #include "RouteController.h"
 
+#include <arpa/inet.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <linux/fib_rules.h>
+#include <net/if.h>
+#include <sys/stat.h>
+
+#include <map>
+
 #include "Fwmark.h"
 #include "UidRanges.h"
 
 #include "logwrap/logwrap.h"
 #include "resolv_netid.h"
 
-#include <arpa/inet.h>
-#include <fcntl.h>
-#include <linux/fib_rules.h>
-#include <map>
-#include <net/if.h>
-#include <sys/stat.h>
-
 namespace {
 
 // BEGIN CONSTANTS --------------------------------------------------------------------------------