Skip to content

Commit e6db593

Browse files
flichtenheldcron2
authored andcommitted
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 <frank@lichtenheld.com> Acked-by: Gert Doering <gert@greenie.muc.de> Message-Id: <20250804195054.21729-1-gert@greenie.muc.de> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg32513 Signed-off-by: Gert Doering <gert@greenie.muc.de>
1 parent 3cca336 commit e6db593

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.github/workflows/build.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ jobs:
116116
arch: [x86, x64]
117117
test: [argv, auth_token, buffer, cryptoapi, crypto, misc, ncp, packet_id, pkt, provider, ssl, tls_crypt, user_pass]
118118

119-
runs-on: windows-latest
119+
runs-on: windows-2025
120120
name: "mingw unittest ${{ matrix.test }} - ${{ matrix.arch }} - OSSL"
121121
steps:
122122
- name: Checkout OpenVPN
@@ -264,7 +264,7 @@ jobs:
264264
env:
265265
BUILD_CONFIGURATION: Release
266266

267-
runs-on: windows-latest
267+
runs-on: windows-2025
268268
steps:
269269
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
270270
- uses: lukka/get-cmake@6b3e96a9bc9976b8b546346fdd102effedae0ca8 # v4.0.3

src/openvpn/syshead.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
#define srandom srand
4545
#endif
4646

47-
#ifdef _MSC_VER /* Visual Studio */
47+
#if defined(_MSC_VER) && !defined(__clang__) /* Microsoft compiler */
4848
#define __func__ __FUNCTION__
4949
#define __attribute__(x)
5050
#endif

0 commit comments

Comments
 (0)