Skip to contentSkip to conversation

repair windows builds (2.4)

PATCH In review Gert Doering 2 participants 3 messages Jul 5, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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"...

---
 src/openvpn/tun.c | 1 +
 1 file changed, 1 insertion(+)
src/openvpn/tun.c +1 -0
index 9b830285..80eaa2c4 100644
@@ -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();
Signature · 1 line
2.21.0
Acked-by on v1 1/1
#1 lore raw

Am 05.07.19 um 15:00 schrieb Gert Doering:

Quoted 10 lines

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"...

I have neither compile tested nor tested the patch itself but since len is really used here, the patch will improve things for the better.

Arne

#2 lore raw
In reply to Gert Doering

Your patch has been applied to the release/2.4 branch.

commit 5b1d07906073702b9fb23ca97f69bc8ba324f609

Author: Gert Doering
Date:   Fri Jul 5 15:00:01 2019 +0200
     repair windows builds (2.4)

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

--
kind regards,

Gert Doering