From: Arne Schwabe Date: Thu, 1 Apr 2021 13:13:25 +0000 (+0200) Subject: Remove superflous ifdefs around enum like defines X-Git-Tag: v2.6_beta1~578 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=213fd3ee49e670124d911634c2f52061a82357af;p=thirdparty%2Fopenvpn.git Remove superflous ifdefs around enum like defines The variables are not used without the configured options but the ifdef around them does not help readibility either. Signed-off-by: Arne Schwabe Acked-by: Gert Doering Message-Id: <20210401131337.3684-3-arne@rfc2549.org> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg21958.html Signed-off-by: Gert Doering --- diff --git a/src/openvpn/mtcp.c b/src/openvpn/mtcp.c index 22c824aaa..7d2a69b99 100644 --- a/src/openvpn/mtcp.c +++ b/src/openvpn/mtcp.c @@ -59,13 +59,8 @@ #define MTCP_SOCKET ((void *)1) #define MTCP_TUN ((void *)2) #define MTCP_SIG ((void *)3) /* Only on Windows */ -#ifdef ENABLE_MANAGEMENT #define MTCP_MANAGEMENT ((void *)4) -#endif - -#ifdef ENABLE_ASYNC_PUSH #define MTCP_FILE_CLOSE_WRITE ((void *)5) -#endif #define MTCP_N ((void *)16) /* upper bound on MTCP_x */ diff --git a/src/openvpn/mudp.c b/src/openvpn/mudp.c index e95a7ac81..5af1081fc 100644 --- a/src/openvpn/mudp.c +++ b/src/openvpn/mudp.c @@ -195,12 +195,10 @@ multi_process_io_udp(struct multi_context *m) { strcat(buf, "TW/"); } -#ifdef ENABLE_ASYNC_PUSH else if (status & FILE_CLOSED) { strcat(buf, "FC/"); } -#endif printf("IO %s\n", buf); #endif /* ifdef MULTI_DEBUG_EVENT_LOOP */ diff --git a/src/openvpn/openvpn.h b/src/openvpn/openvpn.h index 3cef26381..1063351d3 100644 --- a/src/openvpn/openvpn.h +++ b/src/openvpn/openvpn.h @@ -252,13 +252,9 @@ struct context_2 #define TUN_WRITE (1<<3) #define ES_ERROR (1<<4) #define ES_TIMEOUT (1<<5) -#ifdef ENABLE_MANAGEMENT #define MANAGEMENT_READ (1<<6) #define MANAGEMENT_WRITE (1<<7) -#endif -#ifdef ENABLE_ASYNC_PUSH #define FILE_CLOSED (1<<8) -#endif unsigned int event_set_status;