Skip to contentSkip to conversation

Fix compilation with --disable-lzo and --disable-lz4

PATCH In review Lev Stipakov 2 participants 2 messages Aug 5, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Fix compilation with --disable-lzo and --disable-lz4

struct compress_options is defined under USE_COMP, therefore compilation fails when it is referenced without that define.

Since function show_compression_warning, which uses aforementioned struct, is only called under USE_COMP, it is safe to wrap its definition under USE_COMP, which fixes compilation issue.

---
 src/openvpn/options.c | 2 ++
 1 file changed, 2 insertions(+)
src/openvpn/options.c +2 -0
index bc256b18..1c246f4b 100644
@@ -5085,6 +5085,7 @@ set_user_script(struct options *options,
 #endif
 }
 
+#ifdef USE_COMP
 static void
 show_compression_warning(struct compress_options *info)
 {
@@ -5103,6 +5104,7 @@ show_compression_warning(struct compress_options *info)
         }
     }
 }
+#endif
 
 static void
 add_option(struct options *options,
Signature · 1 line
2.25.1
Acked-by on v1 1/1
#1 lore raw

Thanks. Tested that it indeed fixes things, and that it is not necessary for 2.4 (compile-tested only).

Added "trac #1308" to the commit message.

Your patch has been applied to the master branch.

commit dab34fdd0639c6de8c5ca759cca00b7e60da32f1

Author: Lev Stipakov
Date:   Wed Aug 5 06:25:48 2020 +0000
     Fix compilation with --disable-lzo and --disable-lz4

     Signed-off-by: Lev Stipakov <[email protected]...>
     Acked-by: Gert Doering <[email protected]...>
     Message-Id: <[email protected]...>
     URL: https://www.mail-archive.com/[email protected]/msg20637.html
     Signed-off-by: Gert Doering <[email protected]...>

--
kind regards,

Gert Doering