Merge "Don't include <linux/...> header files directly."

78b00d81 · jp abgrall · android code review · 8a3da263 · 970274a6 · 78b00d81
Commit 78b00d81 authored 12 years ago by jp abgrall Committed by android code review 12 years ago
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

ResolverController.cpp ResolverController.cpp +1 -1

SecondaryTableController.h SecondaryTableController.h +1 -1

TetherController.h TetherController.h +1 -1

No files found.
--- a/ResolverController.cpp
+++ b/ResolverController.cpp
@@ -19,7 +19,7 @@

 #include <cutils/log.h>

-#include <linux/if.h>
+#include <net/if.h>

 // NOTE: <resolv_iface.h> is a private C library header that provides
 //       declarations for _resolv_set_default_iface() and others.

--- a/SecondaryTableController.h
+++ b/SecondaryTableController.h
@@ -19,7 +19,7 @@

 #include <sysutils/FrameworkListener.h>

-#include <linux/if.h>
+#include <net/if.h>

 #ifndef IFNAMSIZ
 #define IFNAMSIZ 16

--- a/TetherController.h
+++ b/TetherController.h
@@ -17,7 +17,7 @@
 #ifndef _TETHER_CONTROLLER_H
 #define _TETHER_CONTROLLER_H

-#include <linux/in.h>
+#include <netinet/in.h>

 #include "List.h"