[GNUnet-SVN] r26956 - gnunet/src/gns

[gnunet]

Author: LRN
Date: 2013-04-21 15:37:08 +0200 (Sun, 21 Apr 2013)
New Revision: 26956

Modified:
   gnunet/src/gns/w32nsp-resolve.c
   gnunet/src/gns/w32nsp.c
   gnunet/src/gns/w32nsp.def
Log:
Fix mingw-w64 warnings in w32nsp

Modified: gnunet/src/gns/w32nsp-resolve.c
===================================================================
--- gnunet/src/gns/w32nsp-resolve.c     2013-04-21 13:37:03 UTC (rev 26955)
+++ gnunet/src/gns/w32nsp-resolve.c     2013-04-21 13:37:08 UTC (rev 26956)
@@ -162,7 +162,7 @@
   int r = 1;
   WSADATA wsd;
   GUID *prov = NULL;
-  GUID *sc = NULL;
+  const GUID *sc = NULL;
   wchar_t *cmdl;
   int wargc;
   wchar_t **wargv;

Modified: gnunet/src/gns/w32nsp.c
===================================================================
--- gnunet/src/gns/w32nsp.c     2013-04-21 13:37:03 UTC (rev 26955)
+++ gnunet/src/gns/w32nsp.c     2013-04-21 13:37:08 UTC (rev 26956)
@@ -27,11 +27,11 @@
  */
 
 #define INITGUID
-#include <windows.h>
-#include <nspapi.h>
 #include <stdint.h>
 #include <ws2tcpip.h>
 #include <ws2spi.h>
+#include <windows.h>
+#include <nspapi.h>
 
 #if 1
 #  define DEBUGLOG(s, ...)
@@ -403,7 +403,7 @@
 
 int WSAAPI
 GNUNET_W32NSP_LookupServiceNext (HANDLE hLookup, DWORD dwControlFlags,
-    LPDWORD lpdwBufferLength, LPWSAQUERYSET lpqsResults)
+    LPDWORD lpdwBufferLength, LPWSAQUERYSETW lpqsResults)
 {
   DWORD effective_flags;
   int i;

Modified: gnunet/src/gns/w32nsp.def
===================================================================
--- gnunet/src/gns/w32nsp.def   2013-04-21 13:37:03 UTC (rev 26955)
+++ gnunet/src/gns/w32nsp.def   2013-04-21 13:37:08 UTC (rev 26956)
@@ -1,2 +1,2 @@
-NSPStartup
-NSPCleanup
address@hidden
address@hidden