commit 51a0e0f7137d4584ac7394f2794c8b938e1a6b48
author Bernie Innocenti <codewiz@google.com> Fri Oct 05 20:24:06 2018 +0900
committer Bernie Innocenti <codewiz@google.com> Fri Oct 05 20:40:29 2018 +0900
tree d3168db1bff3a2941b191fdea00d2ac7f9df5544
parent dd51202f7a88c0b2e63bd57c44334e56855e0440

Add missing <mutex> header

Also sort the headers in ClatdController.cpp in canonical order.

Test: m netd
Change-Id: I83106ead06294a8bceb952ba89ba2b7b75dcf8b8

server/ClatdController.cpp

diff --git a/server/ClatdController.cpp b/server/ClatdController.cpp
index 52d76f5..9b357f9 100644
--- a/server/ClatdController.cpp
+++ b/server/ClatdController.cpp
@@ -13,6 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+#include "ClatdController.h"
+
 #include <map>
 #include <string>
 
@@ -26,8 +29,6 @@
 
 #include <resolv_netid.h>
 
-#include "NetdConstants.h"
-#include "ClatdController.h"
 #include "Fwmark.h"
 #include "NetdConstants.h"
 #include "NetworkController.h"

server/ClatdController.h

diff --git a/server/ClatdController.h b/server/ClatdController.h
index 74eb818..7af6ac3 100644
--- a/server/ClatdController.h
+++ b/server/ClatdController.h
@@ -18,6 +18,7 @@
 #define _CLATD_CONTROLLER_H
 
 #include <map>
+#include <mutex>
 
 namespace android {
 namespace net {