Fix the CMake build on Windows when using PThreads

Summary: I broke things, so now I have to fix them.

Reviewed By: yfeldblum

Differential Revision: D4981674

fbshipit-source-id: 7df4d78cf4f984df158051a3a8b277a0bcad583b

diff --git a/CMake/folly-config.h.cmake b/CMake/folly-config.h.cmake
index 7841aa08c4ddda366d5360a5b80e3bb3d27c2c07..1cefa401724f3d1c0cac68980c08093b033b3c65 100755 (executable)
--- a/CMake/folly-config.h.cmake
+++ b/CMake/folly-config.h.cmake
@@ -16,7 +16,7 @@
 \r
 #pragma once\r
 \r
-#cmakedefine FOLLY_HAVE_PTHREAD\r
+#cmakedefine FOLLY_HAVE_PTHREAD 1\r
 \r
 #define FOLLY_HAVE_LIBGFLAGS 1\r
 #define FOLLY_UNUSUAL_GFLAGS_NAMESPACE 1\r

diff --git a/folly/ThreadName.cpp b/folly/ThreadName.cpp
index acd6163f66ca6be80d0de1e751e3c73a042042e1..3e2d9aab189218a34db1a0b5067ccaa7eb69fc6a 100644 (file)
--- a/folly/ThreadName.cpp
+++ b/folly/ThreadName.cpp
@@ -58,7 +58,7 @@ bool canSetOtherThreadName() {
 }
 
 bool setThreadName(std::thread::id tid, StringPiece name) {
-#if !FOLLY_HAVE_PTHREAD
+#if !FOLLY_HAVE_PTHREAD || _WIN32
   return false;
 #else
   static_assert(