cleanup after rebase

external/CMakeLists.txt

@@ -84,11 +84,3 @@ set(ENABLE_BORINGSSL OFF CACHE BOOL "Disable boringssl for ngtcp2")
 
 add_definitions(-D_GNU_SOURCE)
 add_subdirectory(ngtcp2 EXCLUDE_FROM_ALL)
-
-set(CPR_BUILD_TESTS OFF)
-if(WIN32)
-  set(CPR_FORCE_WINSSL_BACKEND ON)
-else()
-  set(CPR_FORCE_USE_SYSETM_CURL ON)
-endif()
-add_subdirectory(cpr EXCLUDE_FROM_ALL)

include/lokinet/lokinet_os.h

@@ -1,26 +0,0 @@
-#pragma once
-
-/// OS specific types
-
-#ifdef _WIN32
-
-#else
-#include <sys/uio.h>
-#include <poll.h>
-
-#endif
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-#ifdef _WIN32
-  typedef HANDLE OS_FD_t;
-#else
-typedef int OS_FD_t;
-#endif
-
-#ifdef __cplusplus
-}
-#endif

include/lokinet/lokinet_udp.h

@@ -1,7 +1,19 @@
 #pragma once
 
 #include "lokinet_context.h"
-#include "lokinet_os.h"
+
+#ifdef _WIN32
+extern "C"
+{
+  struct iovec
+  {
+    void* iov_base;
+    size_t iov_len;
+  };
+}
+#else
+#include <sys/uio.h>
+#endif
 
 #ifdef __cplusplus
 extern "C"

llarp/CMakeLists.txt

@@ -247,12 +247,13 @@ target_link_libraries(liblokinet PRIVATE libunbound)
 if(BUILD_LIBLOKINET)
   include(GNUInstallDirs)
   add_library(lokinet-shared SHARED lokinet_shared.cpp)
-  set_target_properties(lokinet-shared PROPERTIES OUTPUT_NAME lokinet)
   target_link_libraries(lokinet-shared PUBLIC liblokinet)
   install(TARGETS lokinet-shared LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
   if(WIN32)
+    set(CMAKE_SHARED_LIBRARY_PREFIX_CXX "")
     target_link_libraries(lokinet-shared PUBLIC ws2_32 iphlpapi -fstack-protector)
   endif()
+  set_target_properties(lokinet-shared PROPERTIES OUTPUT_NAME lokinet)
   add_log_tag(lokinet-shared)
 endif()
 

llarp/lokinet_shared.cpp

@@ -12,6 +12,10 @@
 
 #include <mutex>
 
+#ifdef _WIN32
+#define EHOSTDOWN ENETDOWN
+#endif
+
 namespace
 {
   struct Context : public llarp::Context