Additional changes from a merge commit.

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)

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

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)