am edb95c3f: am 937cfa77: Merge "ZygoteInit: use correct header files."

* commit 'edb95c3f3ca4e51ef0432af925b8f4330e6dae81': ZygoteInit: use correct header files.
2013-03-01 17:41:53 +00:00
parent 14b628a340 edb95c3f3c
commit e606757966
1 changed files with 1 additions and 5 deletions
--- a/core/jni/com_android_internal_os_ZygoteInit.cpp
+++ b/core/jni/com_android_internal_os_ZygoteInit.cpp
@@ -27,12 +27,8 @@
 #include <JNIHelp.h>
 #include "android_runtime/AndroidRuntime.h"

-#include <linux/capability.h>
-#include <linux/prctl.h>
+#include <sys/capability.h>
 #include <sys/prctl.h>
-extern "C" int capget(cap_user_header_t hdrp, cap_user_data_t datap);
-extern "C" int capset(cap_user_header_t hdrp, const cap_user_data_t datap);
-

 namespace android {