From: "plaisthos (Code Review)" Date: Wed, 15 May 2024 09:48:07 +0000 References: Reply-To: arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: <957a8e1829b1d1e7827be18b0a46d10fa8d65958-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="N82Osg64Zn4="; charset=UTF-8 Subject: [Openvpn-devel] [S] Change in openvpn[master]: Remove check for anonymous unions from configure and cmake config List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: flichtenheld Cc: openvpn-devel --N82Osg64Zn4= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: flichtenheld. Hello flichtenheld, I'd like you to do a code review. Please visit http://gerrit.openvpn.net/c/openvpn/+/588?usp=3Demail to review the following change. Change subject: Remove check for anonymous unions from configure and cmake = config ...................................................................... Remove check for anonymous unions from configure and cmake config Anonymous unions/structs are technically a custom GNU C99 feature but was already widely supported by other compilers. With C11 this feature has become a standard feature so all compilers nowadays support it. Change-Id: I1ef5f6f21f0135a628a63553c39515fa4549ce87 Signed-off-by: Arne Schwabe --- M config.h.cmake.in M configure.ac M src/openvpn/mroute.h 3 files changed, 1 insertion(+), 36 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/88/588/1 diff --git a/config.h.cmake.in b/config.h.cmake.in index 2cdfdcc..a4f0893 100644 --- a/config.h.cmake.in +++ b/config.h.cmake.in @@ -65,9 +65,6 @@ /* Enable --x509-username-field feature */ #cmakedefine ENABLE_X509ALTUSERNAME -/* Compiler supports anonymous unions */ -#define HAVE_ANONYMOUS_UNION_SUPPORT - /* Define to 1 if you have the header file. */ #cmakedefine HAVE_ARPA_INET_H 1 diff --git a/configure.ac b/configure.ac index 965ed1a..5f72029 100644 --- a/configure.ac +++ b/configure.ac @@ -564,28 +564,6 @@ , [[${SOCKET_INCLUDES}]] ) -AC_MSG_CHECKING([anonymous union support]) -AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[ - struct mystruct { - union { - int m1; - char m2; - }; - }; - ]], - [[ - struct mystruct s; - s.m1 =3D 1; s.m2 =3D 2; - ]] - )], - [ - AC_MSG_RESULT([yes]) - AC_DEFINE([HAVE_ANONYMOUS_UNION_SUPPORT], [], [Compiler supports anonymo= us unions]) - ], - [AC_MSG_RESULT([no])] -) saved_LDFLAGS=3D"$LDFLAGS" LDFLAGS=3D"$LDFLAGS -Wl,--wrap=3Dexit" diff --git a/src/openvpn/mroute.h b/src/openvpn/mroute.h index bc58493..8b457d4 100644 --- a/src/openvpn/mroute.h +++ b/src/openvpn/mroute.h @@ -96,17 +96,7 @@ uint8_t prefix[12]; in_addr_t addr; /* _network order_ IPv4 address */ } v4mappedv6; - } -#ifndef HAVE_ANONYMOUS_UNION_SUPPORT -/* Wrappers to support compilers that do not grok anonymous unions */ - mroute_union -#define raw_addr mroute_union.raw_addr -#define ether mroute_union.ether -#define v4 mroute_union.v4 -#define v6 mroute_union.v6 -#define v4mappedv6 mroute_union.v4mappedv6 -#endif - ; + }; }; /* Double-check that struct packing works as expected */ -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/588?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I1ef5f6f21f0135a628a63553c39515fa4549ce87 Gerrit-Change-Number: 588 Gerrit-PatchSet: 1 Gerrit-Owner: plaisthos Gerrit-Reviewer: flichtenheld Gerrit-CC: openvpn-devel Gerrit-Attention: flichtenheld Gerrit-MessageType: newchange --N82Osg64Zn4= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: flichtenheld.

plaisthos would like flichtenheld to review this change.

Vi= ew Change

Remove check for anonymous unions from configure and cmake co=
nfig

Anonymous unions/structs are technically a custom GNU C99 featu= re but
was already widely supported by other compilers. With C11 this fe= ature
has become a standard feature so all compilers nowadays support it= .

Change-Id: I1ef5f6f21f0135a628a63553c39515fa4549ce87
Signed-off= -by: Arne Schwabe <arne@...1227...>
---
M config.h.cmake.in
= M configure.ac
M src/openvpn/mroute.h
3 files changed, 1 insertion(+)= , 36 deletions(-)

git pull ssh://gerrit.openvpn.net:29418/openvpn=
 refs/changes/88/588/1
diff --git a/config.h.cmake.in b/config.h.cm=
ake.in
index 2cdfdcc..a4f0893 100644
--- a/= config.h.cmake.in
+++ b/config.h.cmake.in
@= @ -65,9 +65,6 @@
/* Enable --x509-username-field feature *= /
#cmakedefine ENABLE_X509ALTUSERNAME

-/* Compiler supports ano= nymous unions */
-#defi= ne HAVE_ANONYMOUS_UNION_SUPPORT
-
/* Define to 1 if you have the <arpa/inet.h&= gt; header file. */
#cmakedefine HAVE_ARPA_INET_H 1=

diff --git a/configure.ac b/configure.ac=
index 965ed1a..5f72029 100644
--- a/configure.ac<= /span>
+++ b/configure.ac
@@ -564,28 +564,6 @@
,
[[${SOCKET_INCLUDES}]]
= )
-AC_MSG_CHECKING([ano= nymous union support])
= -AC_COMPILE_IFELSE(
- [= AC_LANG_PROGRAM(
- [[<= /span>
- struct mystruct {
- union {
= - int m1;
- char m2;
- };
- };
- ]],
- [[- struct mystruct s;- s.m1 =3D 1; s.m2 =3D 2;
- ]]
- )],
- [
- AC= _MSG_RESULT([yes])
- A= C_DEFINE([HAVE_ANONYMOUS_UNION_SUPPORT], [], [Compiler supports anonymous u= nions])
- ],
= - [AC_MSG_RESULT([no])]-)

<= span> saved_LDFLAGS=3D"$LDFLAGS"

LDFLAGS=3D"= ;$LDFLAGS -Wl,--wrap=3Dexit"
diff --git a/src/openvpn/= mroute.h b/src/openvpn/mroute.h
index bc58493..8b457d4 1006= 44
--- a/src/openvpn/mroute.h
+++ b/src/ope= nvpn/mroute.h
@@ -96,17 +96,7 @@
= uint8_t prefix[12];
in_addr_t addr; /* = _network order_ IPv4 address */
} v4mappedv6;
- }
-#ifndef HAVE_ANONYMOUS_UNION_SUPPORT
-/* Wrappers to support comp= ilers that do not grok anonymous unions */
- mroute_union
-#define raw_addr mroute_union.raw_addr
-#define ether mroute_union.ether
-#define v4 mroute_union.v4<= /span>
-#define v6 mroute_unio= n.v6
-#define v4mappedv= 6 mroute_union.v4mappedv6
-#endif
- ;
+ };
}= ;

/* Double-check that struct packing wo= rks as expected */

To view, visit change 588= . To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I1ef5f6f21f0135a628a63553c39= 515fa4549ce87
Gerrit-Change-Number: 588
Gerrit-PatchSet: 1
Gerrit-Owner: plaisthos <arne-openvpn@...1711...= 27...>
Gerrit-Reviewer: flichtenheld <frank@...2716...= 1...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-Attention: flichtenheld <frank@...2375...= 41...>
Gerrit-MessageType: newchange
--N82Osg64Zn4=--