1. openvpn
  2. Commit 5b1d07906073702b9fb23ca97f69bc8ba324f609
Browse code

repair windows builds (2.4)

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>

Gert Doering authored on 2019/07/05 22:00:01
Showing 1 changed files
src/openvpn/tun.c
History View file @ 5b1d079
... ... 
@@ -5374,6 +5374,7 @@ netsh_enable_dhcp(const char *actual_name)
5374 5374 
 static bool
5375 5375 
 service_enable_dhcp(const struct tuntap *tt)
5376 5376 
 {
5377 
+    DWORD len;
5377 5378 
     bool ret = false;
5378 5379 
     ack_message_t ack;
5379 5380 
     struct gc_arena gc = gc_new();