(wangle) fix after-delete assert

[folly.git] / folly / ThreadName.h

diff --git a/folly/ThreadName.h b/folly/ThreadName.h
index f2b7d063cc2930bf8978d7727b4a45f245446c23..2730277f6e3185818143ae556264a44a65b9caca 100644 (file)
--- a/folly/ThreadName.h
+++ b/folly/ThreadName.h
@@ -23,14 +23,14 @@ namespace folly {
 
 // This looks a bit weird, but it's necessary to avoid
 // having an undefined compiler function called.
-#if defined(__GLIBC__) && !defined(__APPLE__)
+#if defined(__GLIBC__) && !defined(__APPLE__) && !defined(__ANDROID__)
 #if __GLIBC_PREREQ(2, 12)
-# define FOLLY_GLIBC_2_12
+# define FOLLY_HAS_PTHREAD_SETNAME_NP
 #endif
 #endif
 
 inline bool setThreadName(pthread_t id, StringPiece name) {
-#ifdef FOLLY_GLIBC_2_12
+#ifdef FOLLY_HAS_PTHREAD_SETNAME_NP
   return 0 == pthread_setname_np(id, name.fbstr().substr(0, 15).c_str());
 #else
   return false;