From: "flichtenheld (Code Review)" Date: Mon, 4 Aug 2025 12:04:18 +0000 References: Reply-To: frank@...2641..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net Message-ID: <08c4451dabd292bf745fb0a66aedb35dec8b6c38-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="CHqE1DvnyKk="; 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: plaisthos Cc: openvpn-devel --CHqE1DvnyKk= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: plaisthos. Hello plaisthos, I'd like you to do a code review. Please visit http://gerrit.openvpn.net/c/openvpn/+/1127?usp=3Demail to review the following change. 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 --- M .github/workflows/build.yaml M src/openvpn/syshead.h 2 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/27/1127/1 diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index bd5895b..cc17fba 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -125,7 +125,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 @@ -273,7 +273,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 e77f313..da53635 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: 1 Gerrit-Owner: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-MessageType: newchange --CHqE1DvnyKk= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: plaisthos.

flichtenheld would like plaisthos to review this change.

V= iew Change

Fix build error with clang-cl on latest Windows SDK

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

Change-Id: I3046f4b09a4700001a1d9dcce802990= dfa701b52
Signed-off-by: Frank Lichtenheld <frank@...2641...>
-= --
M .github/workflows/build.yaml
M src/openvpn/syshead.h
2 files = changed, 3 insertions(+), 3 deletions(-)

git pull ssh://gerrit.op=
envpn.net:29418/openvpn refs/changes/27/1127/1
diff --git a/.github=
/workflows/build.yaml b/.github/workflows/build.yaml
index = bd5895b..cc17fba 100644
--- a/.github/workflows/build.yaml<= /span>
+++ b/.github/workflows/build.yaml
@@ -125,= 7 +125,7 @@
arch: [x86, x64]
= test: [argv, auth_token, buffer, cryptoapi, crypto, misc, ncp, packet_i= d, pkt, provider, ssl, tls_crypt, user_pass]

- runs-on: windows-latest
=
+ runs-on: windows-2025<= /span>
name: "mingw unittest ${{ matrix.test }} - ${{ ma= trix.arch }} - OSSL"
steps:
= - name: Checkout OpenVPN
@@ -273,7 +273,7 @@
env:

BUILD_CONFIGURATION: Release

- run= s-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/sr= c/openvpn/syshead.h b/src/openvpn/syshead.h
index e77f313..= da53635 100644
--- a/src/openvpn/syshead.h
= +++ b/src/openvpn/syshead.h
@@ -44,7 +44,7 @@
#define srandom srand

#endif
<= br>-#ifdef _MSC_VER /* Visual Stu= dio */
+#if defined(_= MSC_VER) && !defined(__clang__) /* Microsoft compiler */
= #define __func__ __FUNCTION__
#define __attribute__= (x)
#endif

To view, vi= sit chan= ge 1127. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I3046f4b09a4700001a1d9dcce80= 2990dfa701b52
Gerrit-Change-Number: 1127
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <frank@...2723...= .>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-Attention: plaisthos <arne-openvpn@...220...= ..1227...>
Gerrit-MessageType: newchange
--CHqE1DvnyKk=--