Merge remote-tracking branch 'opentelemetry/main' into merge_main_int…

…o_async-changes
owent · May 25, 2022 · 0abf162 · 0abf162
2 parents cd3655f + 5c8f476
commit 0abf162
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/cmake/nlohmann-json.cmake b/cmake/nlohmann-json.cmake
@@ -26,7 +26,7 @@ ExternalProject_Add(nlohmann_json_download
 )
 
 ExternalProject_Get_Property(nlohmann_json_download INSTALL_DIR)
-SET(NLOHMANN_JSON_INCLUDE_DIR ${INSTALL_DIR}/third_party/src/nlohmann_json_download/single_include)
+SET(NLOHMANN_JSON_INCLUDE_DIR ${INSTALL_DIR}/src/nlohmann_json_download/single_include)
 add_library(nlohmann_json_ INTERFACE)
 target_include_directories(nlohmann_json_ INTERFACE
     "$<BUILD_INTERFACE:${NLOHMANN_JSON_INCLUDE_DIR}>"

diff --git a/ext/include/opentelemetry/ext/http/client/curl/http_operation_curl.h b/ext/include/opentelemetry/ext/http/client/curl/http_operation_curl.h
@@ -17,6 +17,7 @@
 #  include <io.h>
 #  include <winsock2.h>
 #else
+#  include <poll.h>
 #  include <unistd.h>
 #endif
 #include <curl/curl.h>