]> git.ipfire.org Git - thirdparty/openvpn.git/commitdiff
repair windows builds (2.4)
authorGert Doering <gert@greenie.muc.de>
Fri, 5 Jul 2019 13:00:01 +0000 (15:00 +0200)
committerGert Doering <gert@greenie.muc.de>
Fri, 5 Jul 2019 13:20:43 +0000 (15:20 +0200)
commit 0c1cc8d65539f removed "DWORD len;" from service_enable_dhcp(),
but that variable is far from "unused" - breaking compilation.

The problem here was that it's a larger "cleanup compiler warnings"
patch which was fully correct for master, but this particular function
looks different in release/2.4 because the whole iservice call
refactoring patch isn't in release/2.4 - so master does not need the
DWORD len, but release/2.4 does.

More care needed with "warning cleanup"...

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

index 9b830285c9df47eb2d9e42a947ea6db8900422ac..80eaa2c471c8539e4992a675394a0db3d52f1473 100644 (file)
@@ -5374,6 +5374,7 @@ netsh_enable_dhcp(const char *actual_name)
 static bool
 service_enable_dhcp(const struct tuntap *tt)
 {
+    DWORD len;
     bool ret = false;
     ack_message_t ack;
     struct gc_arena gc = gc_new();