From f9fdc8f22236481e14ee3f56b8a8e1f16f0d37af Mon Sep 17 00:00:00 2001
From: LRN <lrn1986@gmail.com>
Date: Wed, 18 Mar 2015 09:37:36 +0000
Subject: [PATCH] Include initguid.h instead of just defining INITGUID

---
 src/gns/gnunet-gns-helper-service-w32.c | 2 +-
 src/gns/w32nsp-install.c                | 2 +-
 src/gns/w32nsp-resolve.c                | 2 +-
 src/gns/w32nsp-uninstall.c              | 2 +-
 src/gns/w32nsp.c                        | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/gns/gnunet-gns-helper-service-w32.c b/src/gns/gnunet-gns-helper-service-w32.c
index 02badb50b..8877ef304 100644
--- a/src/gns/gnunet-gns-helper-service-w32.c
+++ b/src/gns/gnunet-gns-helper-service-w32.c
@@ -23,7 +23,6 @@
  * @author Christian Grothoff
  * @author LRN
  */
-#define INITGUID
 #include "platform.h"
 #include <gnunet_util_lib.h>
 #include <gnunet_identity_service.h>
@@ -34,6 +33,7 @@
 #include "w32resolver.h"
 #include <nspapi.h>
 #include <unistr.h>
+#include <initguid.h>
 
 #define DEFINE_DNS_GUID(a,x) DEFINE_GUID(a, 0x00090035, 0x0000, x, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46)
 DEFINE_DNS_GUID(SVCID_DNS_TYPE_A, 0x0001);
diff --git a/src/gns/w32nsp-install.c b/src/gns/w32nsp-install.c
index 698f2d6d5..dc3033b96 100644
--- a/src/gns/w32nsp-install.c
+++ b/src/gns/w32nsp-install.c
@@ -23,12 +23,12 @@
  * @author LRN
  */
 
-#define INITGUID
 #include <ws2spi.h>
 #include <windows.h>
 #include <nspapi.h>
 #include "gnunet_w32nsp_lib.h"
 #include <stdio.h>
+#include <initguid.h>
 
 int
 main (int argc, char **argv)
diff --git a/src/gns/w32nsp-resolve.c b/src/gns/w32nsp-resolve.c
index af30b9758..587730513 100644
--- a/src/gns/w32nsp-resolve.c
+++ b/src/gns/w32nsp-resolve.c
@@ -22,7 +22,6 @@
  * @brief W32 integration for GNS
  * @author LRN
  */
-#define INITGUID
 #include <ws2tcpip.h>
 #include <windows.h>
 #include <nspapi.h>
@@ -30,6 +29,7 @@
 #include <nspapi.h>
 #include "gnunet_w32nsp_lib.h"
 #include <stdio.h>
+#include <initguid.h>
 
 typedef int (WSPAPI *LPNSPSTARTUP) (LPGUID lpProviderId, LPNSP_ROUTINE lpnspRoutines);
 
diff --git a/src/gns/w32nsp-uninstall.c b/src/gns/w32nsp-uninstall.c
index 6b123cc38..d76663926 100644
--- a/src/gns/w32nsp-uninstall.c
+++ b/src/gns/w32nsp-uninstall.c
@@ -1,9 +1,9 @@
-#define INITGUID
 #include <ws2spi.h>
 #include <windows.h>
 #include <nspapi.h>
 #include "gnunet_w32nsp_lib.h"
 #include <stdio.h>
+#include <initguid.h>
 
 int
 main (int argc, char **argv)
diff --git a/src/gns/w32nsp.c b/src/gns/w32nsp.c
index 822eb0353..ae9509ec6 100644
--- a/src/gns/w32nsp.c
+++ b/src/gns/w32nsp.c
@@ -71,7 +71,7 @@
 #endif
 #endif
 #include "w32resolver.h"
-#define INITGUID
+#include <initguid.h>
 #include "gnunet_w32nsp_lib.h"
 #undef INITGUID
 
-- 
2.25.1