commit 663af03a76b4ce724b1bdb135cec8339480652b3
author Elliott Hughes <enh@google.com> Sat Jul 19 00:48:19 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Jul 19 00:48:19 2014 +0000
tree 85b259a384ead672e267ddb13ce43adf31da8372
parent c3f0821fbd3d19d2089539500adb114e63145763
parent 840d4f2c49da75c994e73728978f0539126c2fc9

am 840d4f2c: am d8b00c89: Merge "Fix implicit declaration of function \'prctl\' in logd."

* commit '840d4f2c49da75c994e73728978f0539126c2fc9':
  Fix implicit declaration of function 'prctl' in logd.

logd/main.cpp

diff --git a/logd/main.cpp b/logd/main.cpp
index ece5a3a..1e1a718 100644
--- a/logd/main.cpp
+++ b/logd/main.cpp
@@ -22,12 +22,11 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/capability.h>
+#include <sys/prctl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <linux/prctl.h>
-
 #include <cutils/properties.h>
 
 #include "private/android_filesystem_config.h"