diff options
| author | Pierre Ossman <ossman@cendio.se> | 2024-10-31 17:06:31 +0100 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2025-02-25 17:18:35 +0100 |
| commit | 8a11ae468d5ad95da5334f4f3fe1cb528f669144 (patch) | |
| tree | 1498decb2f63d12826f787c14d3b227139a81613 | |
| parent | 2e63bd5201be08ea6a3d3538e3778bd66d7f81e6 (diff) | |
| download | tigervnc-8a11ae468d5ad95da5334f4f3fe1cb528f669144.tar.gz tigervnc-8a11ae468d5ad95da5334f4f3fe1cb528f669144.zip | |
Move winerrno.h to core
OS abstractions are generic enough that we can merge these with the new
core library.
| -rw-r--r-- | common/core/winerrno.h (renamed from common/os/winerrno.h) | 0 | ||||
| -rw-r--r-- | common/network/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | common/network/TcpSocket.cxx | 2 | ||||
| -rw-r--r-- | common/rdr/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | common/rdr/FdInStream.cxx | 2 | ||||
| -rw-r--r-- | common/rdr/FdOutStream.cxx | 2 | ||||
| -rw-r--r-- | vncviewer/vncviewer.cxx | 2 |
7 files changed, 6 insertions, 6 deletions
diff --git a/common/os/winerrno.h b/common/core/winerrno.h index a81fdc94..a81fdc94 100644 --- a/common/os/winerrno.h +++ b/common/core/winerrno.h diff --git a/common/network/CMakeLists.txt b/common/network/CMakeLists.txt index 6bfba4de..42472b8d 100644 --- a/common/network/CMakeLists.txt +++ b/common/network/CMakeLists.txt @@ -7,7 +7,7 @@ if(NOT WIN32) endif() target_include_directories(network PUBLIC ${CMAKE_SOURCE_DIR}/common) -target_link_libraries(network core os rdr) +target_link_libraries(network core rdr) if(WIN32) target_link_libraries(network ws2_32) diff --git a/common/network/TcpSocket.cxx b/common/network/TcpSocket.cxx index 7e7379f6..e941aa67 100644 --- a/common/network/TcpSocket.cxx +++ b/common/network/TcpSocket.cxx @@ -49,7 +49,7 @@ #include <network/TcpSocket.h> #ifdef WIN32 -#include <os/winerrno.h> +#include <core/winerrno.h> #endif #ifndef INADDR_NONE diff --git a/common/rdr/CMakeLists.txt b/common/rdr/CMakeLists.txt index 520ac664..55c69132 100644 --- a/common/rdr/CMakeLists.txt +++ b/common/rdr/CMakeLists.txt @@ -17,7 +17,7 @@ add_library(rdr STATIC target_include_directories(rdr PUBLIC ${CMAKE_SOURCE_DIR}/common) target_include_directories(rdr SYSTEM PUBLIC ${ZLIB_INCLUDE_DIRS}) -target_link_libraries(rdr core os) +target_link_libraries(rdr core) target_link_libraries(rdr ${ZLIB_LIBRARIES}) if(GNUTLS_FOUND) diff --git a/common/rdr/FdInStream.cxx b/common/rdr/FdInStream.cxx index 969e0fad..25542a01 100644 --- a/common/rdr/FdInStream.cxx +++ b/common/rdr/FdInStream.cxx @@ -28,7 +28,7 @@ #include <winsock2.h> #define errorNumber WSAGetLastError() #define close closesocket -#include <os/winerrno.h> +#include <core/winerrno.h> #else #include <sys/types.h> #include <sys/socket.h> diff --git a/common/rdr/FdOutStream.cxx b/common/rdr/FdOutStream.cxx index d72a34a6..416926c1 100644 --- a/common/rdr/FdOutStream.cxx +++ b/common/rdr/FdOutStream.cxx @@ -28,7 +28,7 @@ #ifdef _WIN32 #include <winsock2.h> #define errorNumber WSAGetLastError() -#include <os/winerrno.h> +#include <core/winerrno.h> #else #include <sys/types.h> #include <unistd.h> diff --git a/vncviewer/vncviewer.cxx b/vncviewer/vncviewer.cxx index 01da6880..59312d7f 100644 --- a/vncviewer/vncviewer.cxx +++ b/vncviewer/vncviewer.cxx @@ -35,7 +35,7 @@ #include <sys/stat.h> #ifdef WIN32 -#include <os/winerrno.h> +#include <core/winerrno.h> #include <direct.h> #endif |