commit 0e74cfb677319c0f006dcc81f74fb21956807d2a
author Elliott Hughes <enh@google.com> Mon Dec 15 23:09:49 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Dec 15 23:09:49 2014 +0000
tree ac95776941eb8b36ef5217c8567d8b422825e5e5
parent fae953ebccfabfa500b3ebca93202063c8e3501d
parent 292ccd3c181d7e005561c4a009b1f6b411e56179

Merge "Fix references to HAVE_PRCTL."

libcutils/process_name.c

diff --git a/libcutils/process_name.c b/libcutils/process_name.c
index 9c3dfb8..cc931eb 100644
--- a/libcutils/process_name.c
+++ b/libcutils/process_name.c
@@ -17,7 +17,7 @@
 #include <fcntl.h>
 #include <stdlib.h>
 #include <string.h>
-#if defined(HAVE_PRCTL)
+#if defined(__linux__)
 #include <sys/prctl.h>
 #endif
 #include <sys/stat.h>
@@ -51,7 +51,7 @@
     strcpy(copy, new_name);
     process_name = (const char*) copy;
 
-#if defined(HAVE_PRCTL)
+#if defined(__linux__)
     if (len < 16) {
         prctl(PR_SET_NAME, (unsigned long) new_name, 0, 0, 0);
     } else {

libutils/Threads.cpp

diff --git a/libutils/Threads.cpp b/libutils/Threads.cpp
index 9bcd063..b2c6903 100644
--- a/libutils/Threads.cpp
+++ b/libutils/Threads.cpp
@@ -35,7 +35,7 @@
 # define HAVE_CREATETHREAD  // Cygwin, vs. HAVE__BEGINTHREADEX for MinGW
 #endif
 
-#if defined(HAVE_PRCTL)
+#if defined(__linux__)
 #include <sys/prctl.h>
 #endif
 
@@ -100,7 +100,7 @@
 };
 
 void androidSetThreadName(const char* name) {
-#if defined(HAVE_PRCTL)
+#if defined(__linux__)
     // Mac OS doesn't have this, and we build libutil for the host too
     int hasAt = 0;
     int hasDot = 0;