From 71a96531942a2c8e51c2e75cbbbd57f0fd0f48fb Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Thu, 29 Aug 2019 01:05:47 +0200 Subject: third-party: remove msvc-compat/unistd.h (#10465) This was upstreamed into unibilium. --- third-party/cmake/BuildUnibilium.cmake | 3 --- third-party/cmake/UnibiliumCMakeLists.txt | 4 ---- third-party/msvc-compat/unistd.h | 10 ---------- 3 files changed, 17 deletions(-) delete mode 100644 third-party/msvc-compat/unistd.h diff --git a/third-party/cmake/BuildUnibilium.cmake b/third-party/cmake/BuildUnibilium.cmake index f5342e3d34..e9deeb4987 100644 --- a/third-party/cmake/BuildUnibilium.cmake +++ b/third-party/cmake/BuildUnibilium.cmake @@ -14,9 +14,6 @@ if(WIN32) CONFIGURE_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/cmake/UnibiliumCMakeLists.txt ${DEPS_BUILD_DIR}/src/unibilium/CMakeLists.txt - COMMAND ${CMAKE_COMMAND} -E copy - ${CMAKE_CURRENT_SOURCE_DIR}/msvc-compat/unistd.h - ${DEPS_BUILD_DIR}/src/unibilium/msvc-compat/unistd.h COMMAND ${CMAKE_COMMAND} ${DEPS_BUILD_DIR}/src/unibilium -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR} # Pass toolchain diff --git a/third-party/cmake/UnibiliumCMakeLists.txt b/third-party/cmake/UnibiliumCMakeLists.txt index a96482bcbb..08a8599352 100644 --- a/third-party/cmake/UnibiliumCMakeLists.txt +++ b/third-party/cmake/UnibiliumCMakeLists.txt @@ -18,10 +18,6 @@ else() endif() target_compile_definitions(unibilium PUBLIC TERMINFO_DIRS=${TERMINFO_DIRS}) -if(MSVC) - target_include_directories(unibilium PUBLIC ${PROJECT_SOURCE_DIR}/msvc-compat) -endif() - include(GNUInstallDirs) install(TARGETS unibilium PUBLIC_HEADER diff --git a/third-party/msvc-compat/unistd.h b/third-party/msvc-compat/unistd.h deleted file mode 100644 index d9ee57b54b..0000000000 --- a/third-party/msvc-compat/unistd.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef GUARD_UNIBILIUM_UNISTD_H_ -#define GUARD_UNIBILIUM_UNISTD_H_ - -#ifdef _WIN64 -typedef unsigned __int64 ssize_t; -#else -typedef _W64 unsigned int ssize_t; -#endif - -#endif -- cgit