From: Frank Lichtenheld <fr...@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 <fr...@lichtenheld.com> Acked-by: Gert Doering <g...@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 <g...@greenie.muc.de> 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 _______________________________________________ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel
