From: Heiko Hund Date: Wed, 12 Nov 2025 09:22:10 +0000 (+0100) Subject: win: remove checks for PATHCCH_ENSURE_TRAILING_SLASH X-Git-Tag: v2.7_rc2~28 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=763160a16a8910d039cdb2359b10ec61b8041e4b;p=thirdparty%2Fopenvpn.git win: remove checks for PATHCCH_ENSURE_TRAILING_SLASH Since the define is no longer used, remove configuration-time checks if it exists, and also code dealing with situations where it doesn't. Change-Id: I50f189048ef1a624e6ac84b71d7b22fcbbc3ab6b Signed-off-by: Heiko Hund Acked-by: Lev Stipakov Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1354 Message-Id: <20251112092216.22703-1-gert@greenie.muc.de> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg34335.html Signed-off-by: Gert Doering --- diff --git a/configure.ac b/configure.ac index f6e4b6d78..44c7b653c 100644 --- a/configure.ac +++ b/configure.ac @@ -1383,17 +1383,6 @@ if test "${enable_pkcs11}" = "yes"; then fi fi -if test "${WIN32}" == "yes"; then - AC_CHECK_DECLS( - [PATHCCH_ENSURE_TRAILING_SLASH], - [AC_DEFINE([HAVE_PATHCCH_ENSURE_TRAILING_SLASH], [1], [PATHCCH_ENSURE_TRAILING_SLASH is defined])], - , - [[ - #include - ]] - ) -fi - # When testing a compiler option, we add -Werror to force # an error when the option is unsupported. This is not # required for gcc, but some compilers such as clang need it. diff --git a/src/openvpnserv/CMakeLists.txt b/src/openvpnserv/CMakeLists.txt index a92ee08c6..2c8f310ea 100644 --- a/src/openvpnserv/CMakeLists.txt +++ b/src/openvpnserv/CMakeLists.txt @@ -8,9 +8,6 @@ add_executable(openvpnserv) include(CheckSymbolExists) -# Some old versions of mingw does not have PATHCCH_OPTIONS enums -- add a check -check_symbol_exists(PATHCCH_ENSURE_TRAILING_SLASH pathcch.h HAVE_PATHCCH_ENSURE_TRAILING_SLASH) - set(MC_GEN_DIR ${CMAKE_CURRENT_BINARY_DIR}/mc) target_include_directories(openvpnserv PRIVATE diff --git a/src/openvpnserv/validate.c b/src/openvpnserv/validate.c index 2dcfe1ae5..b3189b775 100644 --- a/src/openvpnserv/validate.c +++ b/src/openvpnserv/validate.c @@ -27,10 +27,6 @@ #include #include -#ifndef HAVE_PATHCCH_ENSURE_TRAILING_SLASH -#define PATHCCH_ENSURE_TRAILING_SLASH 0x20 -#endif - static const WCHAR *white_list[] = { L"auth-retry", L"config",