From c7f7f38367118d51f14da41081ff2bc21ac84d52 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Tue, 4 Jul 2023 11:44:57 +0200 Subject: [PATCH] [ci] deactivate proxy modules on windows current builder is too old for c++11 --- ci/cmake-preloads/config-windows.txt | 2 +- server/proxy/modules/dyn-channel-dump/CMakeLists.txt | 2 +- winpr/include/winpr/sspi.h | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ci/cmake-preloads/config-windows.txt b/ci/cmake-preloads/config-windows.txt index b489555b0..48f435094 100644 --- a/ci/cmake-preloads/config-windows.txt +++ b/ci/cmake-preloads/config-windows.txt @@ -2,7 +2,7 @@ message("PRELOADING windows cache") set (CMAKE_BUILD_TYPE "Debug" CACHE STRING "build type") set (WITH_SERVER ON CACHE BOOL "build with server") set (WITH_SAMPLE ON CACHE BOOL "build with sample") -set (WITH_PROXY_MODULES "ON" CACHE BOOL "Do not build proxy modules") +set (WITH_PROXY_MODULES "OFF" CACHE BOOL "Do not build proxy modules") set (CHANNEL_URBDRC OFF CACHE BOOL "USB redirection") set (BUILD_TESTING ON CACHE BOOL "build testing") set (WITH_SANITIZE_ADDRESS ON) diff --git a/server/proxy/modules/dyn-channel-dump/CMakeLists.txt b/server/proxy/modules/dyn-channel-dump/CMakeLists.txt index ab5a73264..63671ac4c 100644 --- a/server/proxy/modules/dyn-channel-dump/CMakeLists.txt +++ b/server/proxy/modules/dyn-channel-dump/CMakeLists.txt @@ -28,7 +28,7 @@ if (supported) set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE) endif() -set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD_REQUIRED ON) add_library(${PROJECT_NAME} MODULE diff --git a/winpr/include/winpr/sspi.h b/winpr/include/winpr/sspi.h index 27b545894..e219f74aa 100644 --- a/winpr/include/winpr/sspi.h +++ b/winpr/include/winpr/sspi.h @@ -486,14 +486,14 @@ typedef SecPkgCredentials_NamesW* PSecPkgCredentials_NamesW; #define PSecPkgCredentials_Names PSecPkgCredentials_NamesA #endif -typedef struct _SecPkgCredentials_SSIProviderW +typedef struct { SEC_WCHAR* sProviderName; unsigned long ProviderInfoLength; char* ProviderInfo; } SecPkgCredentials_SSIProviderW, *PSecPkgCredentials_SSIProviderW; -typedef struct _SecPkgCredentials_SSIProviderA +typedef struct { SEC_CHAR* sProviderName; unsigned long ProviderInfoLength; @@ -511,7 +511,7 @@ typedef struct _SecPkgCredentials_SSIProviderA #define KDC_PROXY_SETTINGS_V1 1 #define KDC_PROXY_SETTINGS_FLAGS_FORCEPROXY 0x1 -typedef struct _SecPkgCredentials_KdcProxySettingsW +typedef struct { ULONG Version; ULONG Flags; @@ -521,7 +521,7 @@ typedef struct _SecPkgCredentials_KdcProxySettingsW USHORT ClientTlsCredLength; } SecPkgCredentials_KdcProxySettingsW, *PSecPkgCredentials_KdcProxySettingsW; -typedef struct _SecPkgCredentials_KdcProxySettingsA +typedef struct { ULONG Version; ULONG Flags;