explicit instantiation of common Future types

[folly.git] / folly / ThreadName.h

diff --git a/folly/ThreadName.h b/folly/ThreadName.h
index 2d30efa0af94f1ede599bf0b19d8fe546eaf944d..c7a3b15c65de95b8353c79f91499c6b764eeb32a 100644 (file)
--- a/folly/ThreadName.h
+++ b/folly/ThreadName.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Facebook, Inc.
+ * Copyright 2015 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,12 +17,20 @@
 #pragma once
 
 #include <pthread.h>
-#include "Range.h"
+#include <folly/Range.h>
 
 namespace folly {
 
+// This looks a bit weird, but it's necessary to avoid
+// having an undefined compiler function called.
+#if defined(__GLIBC__) && !defined(__APPLE__) && !defined(__ANDROID__)
+#if __GLIBC_PREREQ(2, 12)
+# define FOLLY_HAS_PTHREAD_SETNAME_NP
+#endif
+#endif
+
 inline bool setThreadName(pthread_t id, StringPiece name) {
-#if (defined(__GLIBC__) && __GLIBC_PREREQ(2, 12))
+#ifdef FOLLY_HAS_PTHREAD_SETNAME_NP
   return 0 == pthread_setname_np(id, name.fbstr().substr(0, 15).c_str());
 #else
   return false;