diff mbox series

[Openvpn-devel,v1] Fix build error with clang-cl on latest Windows SDK

Message ID 20250804195054.21729-1-gert@greenie.muc.de
State New
Headers show
Series [Openvpn-devel,v1] Fix build error with clang-cl on latest Windows SDK | expand

Commit Message

Gert Doering Aug. 4, 2025, 7:50 p.m. UTC 
From: Frank Lichtenheld <frank@lichtenheld.com>

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>
---

This change was reviewed on Gerrit and approved by at least one
developer. I request to merge it to master.

Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1127
This mail reflects revision 1 of this Change.

Acked-by according to Gerrit (reflected above):
Gert Doering <gert@greenie.muc.de>

Comments

Gert Doering Aug. 4, 2025, 7:57 p.m. UTC | #1 
I was sure I had seen something like this before, but maybe that was
in a PR that never made it to the list, or so... but indeed, clang-cl
is not MSVC.

Your patch has been applied to the master branch.

commit e6db5936f383542983cf38ffe6841100df4118c7
Author: Frank Lichtenheld
Date:   Mon Aug 4 21:50:48 2025 +0200

     Fix build error with clang-cl on latest Windows SDK

     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>


--
kind regards,

Gert Doering
diff mbox series

Patch

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, packet_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@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - uses: lukka/get-cmake@6b3e96a9bc9976b8b546346fdd102effedae0ca8 # 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