remove 'nac' option from VPN, always return IP immediately, always build mesh tunnel...

[oweals/gnunet.git] / src / vpn / gnunet-helper-vpn-windows.c

diff --git a/src/vpn/gnunet-helper-vpn-windows.c b/src/vpn/gnunet-helper-vpn-windows.c
index 7dee536095ef36366b6a987e315f87c0997544bb..0d31ee3996cbda41809b902f24de1dedafb22b06 100644 (file)
--- a/src/vpn/gnunet-helper-vpn-windows.c
+++ b/src/vpn/gnunet-helper-vpn-windows.c
@@ -31,11 +31,16 @@
  */
 
 #include <stdio.h>
+#include <Winsock2.h>
 #include <windows.h>
 #include <setupapi.h>
+#ifndef __MINGW64_VERSION_MAJOR
 #include <ddk/cfgmgr32.h>
 #include <ddk/newdev.h>
-#include <Winsock2.h>
+#else
+#include <cfgmgr32.h>
+#include <newdev.h>
+#endif
 #include <time.h>
 #include "platform.h"
 #include "tap-windows.h"
@@ -1356,7 +1361,7 @@ run (HANDLE tap_handle)
    * DHCP and such are all features we will never use in gnunet afaik.
    * But for openvpn those are essential.
    */
-  if ((privilege_testing) || (! tun_up (tap_handle))
+  if ((privilege_testing) || (! tun_up (tap_handle)))
     goto teardown_final;
 
   /* Initialize our overlapped IO structures*/