From: Frank Lichtenheld Date: Wed, 8 Oct 2025 10:55:01 +0000 (+0200) Subject: vlan: Remove -Wconversion override X-Git-Tag: v2.7_beta3~20 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5a042b0702c98d5e32889bec2a9b22d2ac3d79bd;p=thirdparty%2Fopenvpn.git vlan: Remove -Wconversion override Only Debian 11 (GCC 10) complains about this. We decided not to add work-arounds for GCC 10 and older and instead accept that they do not build -Werror clean. Change-Id: I73c46ac630834a8cf8894aaa2dcc429fbedd3db7 Signed-off-by: Frank Lichtenheld Acked-by: Gert Doering Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1179 Message-Id: <20251008105507.9997-1-gert@greenie.muc.de> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg33285.html Signed-off-by: Gert Doering --- diff --git a/src/openvpn/vlan.c b/src/openvpn/vlan.c index 3da470a93..a6a6e93c6 100644 --- a/src/openvpn/vlan.c +++ b/src/openvpn/vlan.c @@ -43,11 +43,6 @@ vlanhdr_get_vid(const struct openvpn_8021qhdr *hdr) return ntohs(hdr->pcp_cfi_vid & OPENVPN_8021Q_MASK_VID); } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wconversion" -#endif - /* * Set the VLAN Identifier (VID) in an IEEE 802.1Q header. * @@ -61,10 +56,6 @@ vlanhdr_set_vid(struct openvpn_8021qhdr *hdr, const uint16_t vid) (hdr->pcp_cfi_vid & ~OPENVPN_8021Q_MASK_VID) | (htons(vid) & OPENVPN_8021Q_MASK_VID); } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic pop -#endif - /* * vlan_decapsulate - remove 802.1q header and return VID *