From a982b9da7227e43c3f442142fb4681ba02ab941c Mon Sep 17 00:00:00 2001
From: Alex Miller <alexmiller@apple.com>
Date: Thu, 13 Dec 2018 17:13:41 -0800
Subject: [PATCH] Additional changes from a merge commit.

---
 CMakeLists.txt        | 1 -
 fdbrpc/CMakeLists.txt | 1 +
 flow/CMakeLists.txt   | 1 +
 3 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ab91d8264a..572ab759a0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -168,7 +168,6 @@ else()
     -fvisibility=hidden
     -Wreturn-type
     -fdiagnostics-color=always
-    -DTLS_DISABLED=1  # TODO: Add TLS support.
     -fPIC)
 
   if(CMAKE_COMPILER_IS_GNUCXX)
diff --git a/fdbrpc/CMakeLists.txt b/fdbrpc/CMakeLists.txt
index df0a9ef461..dcea3cea4f 100644
--- a/fdbrpc/CMakeLists.txt
+++ b/fdbrpc/CMakeLists.txt
@@ -21,6 +21,7 @@ set(FDBRPC_SRCS
   LoadBalance.actor.h
   Locality.cpp
   Net2FileSystem.cpp
+  networksender.actor.h
   Platform.cpp
   QueueModel.cpp
   ReplicationPolicy.cpp
diff --git a/flow/CMakeLists.txt b/flow/CMakeLists.txt
index 71e96f6bb2..e27e994dc8 100644
--- a/flow/CMakeLists.txt
+++ b/flow/CMakeLists.txt
@@ -85,6 +85,7 @@ if (NOT APPLE)
 endif()
 target_link_libraries(flow PRIVATE ${FLOW_LIBS})
 target_link_libraries(flow PUBLIC boost_target Threads::Threads ${CMAKE_DL_LIBS})
+target_compile_definitions(flow PUBLIC TLS_DISABLED)
 
 if(APPLE)
   find_library(IO_KIT IOKit)