From: "cron2 (Code Review)" Date: Mon, 4 Aug 2025 19:57:29 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="cWf87irLspQ="; charset=UTF-8 Subject: [Openvpn-devel] [XS] Change in openvpn[master]: Fix build error with clang-cl on latest Windows SDK List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: flichtenheld Cc: plaisthos , openvpn-devel --cWf87irLspQ= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/11= 27?usp=3Demail ) Change subject: Fix build error with clang-cl on latest Windows SDK ...................................................................... Fix build error with clang-cl on latest Windows SDK Found when testing windows-2025 runner in GHA. So switch to that to make sure the error is fixed. Change-Id: I3046f4b09a4700001a1d9dcce802990dfa701b52 Signed-off-by: Frank Lichtenheld Acked-by: Gert Doering Message-Id: <20250804195054.21729-1-gert@...1296...> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg32= 513 Signed-off-by: Gert Doering --- M .github/workflows/build.yaml M src/openvpn/syshead.h 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index b2bfd21..f7883c7 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -116,7 +116,7 @@ arch: [x86, x64] test: [argv, auth_token, buffer, cryptoapi, crypto, misc, ncp, pac= ket_id, pkt, provider, ssl, tls_crypt, user_pass] - runs-on: windows-latest + runs-on: windows-2025 name: "mingw unittest ${{ matrix.test }} - ${{ matrix.arch }} - OSSL" steps: - name: Checkout OpenVPN @@ -264,7 +264,7 @@ env: BUILD_CONFIGURATION: Release - runs-on: windows-latest + runs-on: windows-2025 steps: - uses: actions/checkout@...2844... # v4.2.2 - uses: lukka/get-cmake@...2897... # v4.0.3 diff --git a/src/openvpn/syshead.h b/src/openvpn/syshead.h index 524923b..26a553b 100644 --- a/src/openvpn/syshead.h +++ b/src/openvpn/syshead.h @@ -44,7 +44,7 @@ #define srandom srand #endif -#ifdef _MSC_VER /* Visual Studio */ +#if defined(_MSC_VER) && !defined(__clang__) /* Microsoft compiler */ #define __func__ __FUNCTION__ #define __attribute__(x) #endif -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1127?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I3046f4b09a4700001a1d9dcce802990dfa701b52 Gerrit-Change-Number: 1127 Gerrit-PatchSet: 2 Gerrit-Owner: flichtenheld Gerrit-Reviewer: cron2 Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-MessageType: merged --cWf87irLspQ= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 submitted this change.

View Change

Fix build error with clang-cl on latest Windo=
ws SDK

Found when testing windows-2025 runner in GHA.
So switch t= o that to make sure the error is fixed.

Change-Id: I3046f4b09a470000= 1a1d9dcce802990dfa701b52
Signed-off-by: Frank Lichtenheld <frank@...1665...= 641...>
Acked-by: Gert Doering <gert@...1296...>
Message-Id:= <20250804195054.21729-1-gert@...1296...>
URL: https://www.mail-ar= chive.com/openvpn-devel@lists.sourceforge.net/msg32513
Signed-off-by: Ge= rt Doering <gert@...1296...>
---
M .github/workflows/build.yaml=
M src/openvpn/syshead.h
2 files changed, 3 insertions(+), 3 deletion= s(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml=

index b2bfd21..f7883c7 100644
--- a/.githu= b/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -116,7 +116,7 @@
arch: [x86, x64= ]
test: [argv, auth_token, buffer, cryptoapi, cryp= to, misc, ncp, packet_id, pkt, provider, ssl, tls_crypt, user_pass]<= br>
- runs-on= : windows-latest
+ = runs-on: windows-2025
name: "mingw unittest ${{ = matrix.test }} - ${{ matrix.arch }} - OSSL"
steps= :
- name: Checkout OpenVPN
@@ -264,7= +264,7 @@
env:
BUILD_CONFI= GURATION: Release

- runs-on: windows-latest
+ runs-on: windows-2025
= steps:
- uses: actions/checkout@...2844... # v4.2.2<= /span>
- uses: lukka/get-cmake@...2897... # v4.0.3diff --git a/src/openvpn/syshead.h b/src/openvpn/syshead.hindex 524923b..26a553b 100644
--- a/src/openvpn/sys= head.h
+++ b/src/openvpn/syshead.h
@@ -44,7= +44,7 @@
#define srandom srand
#endif

-#ifde= f _MSC_VER /* Visual Studio */
+#if defined(_MSC_VER) && !defined(__clang__) /* Microsof= t compiler */
#define __func__ __FUNCTION__
#define __attribute__(x)

#endif
=

To view, visit change 1127. To unsubscribe, or for help writing ma= il filters, visit settings.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I3046f4b09a4700001a1d9dcce80= 2990dfa701b52
Gerrit-Change-Number: 1127
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <frank@...2723...= .>
Gerrit-Reviewer: cron2 <gert@...1296...>=
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-MessageType: merged
--cWf87irLspQ=--