From: flichtenheld (C. Review) <ge...@op...> - 2025-08-04 12:04:32
|
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=email 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 <fr...@li...> --- 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, 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 -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1127?usp=email To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I3046f4b09a4700001a1d9dcce802990dfa701b52 Gerrit-Change-Number: 1127 Gerrit-PatchSet: 1 Gerrit-Owner: flichtenheld <fr...@li...> Gerrit-Reviewer: plaisthos <arn...@rf...> Gerrit-CC: openvpn-devel <ope...@li...> Gerrit-Attention: plaisthos <arn...@rf...> Gerrit-MessageType: newchange |
From: cron2 (C. Review) <ge...@op...> - 2025-08-04 19:50:40
|
Attention is currently required from: flichtenheld, plaisthos. cron2 has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/1127?usp=email ) Change subject: Fix build error with clang-cl on latest Windows SDK ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1127?usp=email To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I3046f4b09a4700001a1d9dcce802990dfa701b52 Gerrit-Change-Number: 1127 Gerrit-PatchSet: 1 Gerrit-Owner: flichtenheld <fr...@li...> Gerrit-Reviewer: cron2 <ge...@gr...> Gerrit-Reviewer: plaisthos <arn...@rf...> Gerrit-CC: openvpn-devel <ope...@li...> Gerrit-Attention: plaisthos <arn...@rf...> Gerrit-Attention: flichtenheld <fr...@li...> Gerrit-Comment-Date: Mon, 04 Aug 2025 19:50:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment |
From: Gert D. <ge...@gr...> - 2025-08-04 19:51:08
|
From: Frank Lichtenheld <fr...@li...> 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...@li...> Acked-by: Gert Doering <ge...@gr...> --- 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 <ge...@gr...> 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 |
From: Gert D. <ge...@gr...> - 2025-08-04 19:57:40
|
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 <fr...@li...> Acked-by: Gert Doering <ge...@gr...> Message-Id: <202...@gr...> URL: https://www.mail-archive.com/ope...@li.../msg32513 Signed-off-by: Gert Doering <ge...@gr...> -- kind regards, Gert Doering |
From: cron2 (C. Review) <ge...@op...> - 2025-08-04 19:57:38
|
cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/1127?usp=email ) 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 <fr...@li...> Acked-by: Gert Doering <ge...@gr...> Message-Id: <202...@gr...> URL: https://www.mail-archive.com/ope...@li.../msg32513 Signed-off-by: Gert Doering <ge...@gr...> --- 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, 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 @@ -264,7 +264,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 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=email To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I3046f4b09a4700001a1d9dcce802990dfa701b52 Gerrit-Change-Number: 1127 Gerrit-PatchSet: 2 Gerrit-Owner: flichtenheld <fr...@li...> Gerrit-Reviewer: cron2 <ge...@gr...> Gerrit-Reviewer: plaisthos <arn...@rf...> Gerrit-CC: openvpn-devel <ope...@li...> Gerrit-MessageType: merged |
From: cron2 (C. Review) <ge...@op...> - 2025-08-04 19:57:42
|
cron2 has uploaded a new patch set (#2) to the change originally created by flichtenheld. ( http://gerrit.openvpn.net/c/openvpn/+/1127?usp=email ) The following approvals got outdated and were removed: Code-Review+2 by cron2 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 <fr...@li...> Acked-by: Gert Doering <ge...@gr...> Message-Id: <202...@gr...> URL: https://www.mail-archive.com/ope...@li.../msg32513 Signed-off-by: Gert Doering <ge...@gr...> --- 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/2 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, 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 @@ -264,7 +264,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 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=email To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I3046f4b09a4700001a1d9dcce802990dfa701b52 Gerrit-Change-Number: 1127 Gerrit-PatchSet: 2 Gerrit-Owner: flichtenheld <fr...@li...> Gerrit-Reviewer: cron2 <ge...@gr...> Gerrit-Reviewer: plaisthos <arn...@rf...> Gerrit-CC: openvpn-devel <ope...@li...> Gerrit-MessageType: newpatchset |