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
+#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 "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);
namespace {
std::atomic_uint netIdForProcess(NETID_UNSET);
#define LOG_TAG "InterfaceController"
#include <cutils/log.h>
#define LOG_TAG "InterfaceController"
#include <cutils/log.h>
* limitations under the License.
*/
* limitations under the License.
*/
+#include <ctype.h>
+#include <errno.h>
#include <fcntl.h>
#include <netdb.h>
#include <fcntl.h>
#include <netdb.h>
#include <netinet/in.h>
#include <stdlib.h>
#include <string.h>
#include <sys/wait.h>
#include <netinet/in.h>
#include <stdlib.h>
#include <string.h>
#include <sys/wait.h>
-#include <ctype.h>
-#include <net/if.h>
#include "RouteController.h"
#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 "Fwmark.h"
#include "UidRanges.h"
#include "logwrap/logwrap.h"
#include "resolv_netid.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 --------------------------------------------------------------------------------
namespace {
// BEGIN CONSTANTS --------------------------------------------------------------------------------