[Openvpn-devel] Fix #elif TARGET_LINUX missing defined() call

Message ID 20210328143633.10300-1-arne@rfc2549.org
State Accepted
Headers show
Series [Openvpn-devel] Fix #elif TARGET_LINUX missing defined() call | expand

Commit Message

Arne Schwabe March 28, 2021, 3:36 a.m. UTC
I found this when playing with building OpenVPN with cmake.

Signed-off-by: Arne Schwabe <arne@rfc2549.org>
 src/openvpn/tun.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


Gert Doering March 28, 2021, 3:48 a.m. UTC | #1
Acked-by: Gert Doering <gert@greenie.muc.de>

Not sure why it is not erroring-out there, but "symbol not defined"
seems to be good enough as "0".  OTOH, all the other code uses "#ifdef"
or "defined(TARGET_FOO)", so bringing this in line is good.

Your patch has been applied to the master branch.

commit d11c273b07c422dde358e1b1caafd12bf8682e70
Author: Arne Schwabe
Date:   Sun Mar 28 16:36:33 2021 +0200

     Fix #elif TARGET_LINUX missing defined() call

     Signed-off-by: Arne Schwabe <arne@rfc2549.org>
     Acked-by: Gert Doering <gert@greenie.muc.de>
     Message-Id: <20210328143633.10300-1-arne@rfc2549.org>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg21884.html
     Signed-off-by: Gert Doering <gert@greenie.muc.de>

kind regards,

Gert Doering


diff --git a/src/openvpn/tun.h b/src/openvpn/tun.h
index 9d995dd46..902665cc6 100644
--- a/src/openvpn/tun.h
+++ b/src/openvpn/tun.h
@@ -130,7 +130,7 @@  struct tuntap_options {
     int dns6_len;
+#elif defined(TARGET_LINUX)
 struct tuntap_options {
     int txqueuelen;