diff options
author | LRN <lrn1986@gmail.com> | 2013-04-21 13:37:08 +0000 |
---|---|---|
committer | LRN <lrn1986@gmail.com> | 2013-04-21 13:37:08 +0000 |
commit | 686d68855fa395104136a04b89c3234612cad2b1 (patch) | |
tree | 99ba699d7e37227839ae19919b061be53d1612eb /src | |
parent | 88e70911ee4a023f3e3a442f22f7a7693fe642a7 (diff) | |
download | gnunet-686d68855fa395104136a04b89c3234612cad2b1.tar.gz gnunet-686d68855fa395104136a04b89c3234612cad2b1.zip |
Fix mingw-w64 warnings in w32nsp
Diffstat (limited to 'src')
-rw-r--r-- | src/gns/w32nsp-resolve.c | 2 | ||||
-rw-r--r-- | src/gns/w32nsp.c | 6 | ||||
-rw-r--r-- | src/gns/w32nsp.def | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/gns/w32nsp-resolve.c b/src/gns/w32nsp-resolve.c index 3234a1ee5..84f64d8b7 100644 --- a/src/gns/w32nsp-resolve.c +++ b/src/gns/w32nsp-resolve.c | |||
@@ -162,7 +162,7 @@ main (int argc, char **argv) | |||
162 | int r = 1; | 162 | int r = 1; |
163 | WSADATA wsd; | 163 | WSADATA wsd; |
164 | GUID *prov = NULL; | 164 | GUID *prov = NULL; |
165 | GUID *sc = NULL; | 165 | const GUID *sc = NULL; |
166 | wchar_t *cmdl; | 166 | wchar_t *cmdl; |
167 | int wargc; | 167 | int wargc; |
168 | wchar_t **wargv; | 168 | wchar_t **wargv; |
diff --git a/src/gns/w32nsp.c b/src/gns/w32nsp.c index 6e58353a3..c2062637f 100644 --- a/src/gns/w32nsp.c +++ b/src/gns/w32nsp.c | |||
@@ -27,11 +27,11 @@ | |||
27 | */ | 27 | */ |
28 | 28 | ||
29 | #define INITGUID | 29 | #define INITGUID |
30 | #include <windows.h> | ||
31 | #include <nspapi.h> | ||
32 | #include <stdint.h> | 30 | #include <stdint.h> |
33 | #include <ws2tcpip.h> | 31 | #include <ws2tcpip.h> |
34 | #include <ws2spi.h> | 32 | #include <ws2spi.h> |
33 | #include <windows.h> | ||
34 | #include <nspapi.h> | ||
35 | 35 | ||
36 | #if 1 | 36 | #if 1 |
37 | # define DEBUGLOG(s, ...) | 37 | # define DEBUGLOG(s, ...) |
@@ -403,7 +403,7 @@ UnmarshallWSAQUERYSETW (LPWSAQUERYSETW req) | |||
403 | 403 | ||
404 | int WSAAPI | 404 | int WSAAPI |
405 | GNUNET_W32NSP_LookupServiceNext (HANDLE hLookup, DWORD dwControlFlags, | 405 | GNUNET_W32NSP_LookupServiceNext (HANDLE hLookup, DWORD dwControlFlags, |
406 | LPDWORD lpdwBufferLength, LPWSAQUERYSET lpqsResults) | 406 | LPDWORD lpdwBufferLength, LPWSAQUERYSETW lpqsResults) |
407 | { | 407 | { |
408 | DWORD effective_flags; | 408 | DWORD effective_flags; |
409 | int i; | 409 | int i; |
diff --git a/src/gns/w32nsp.def b/src/gns/w32nsp.def index cb128051a..c4070a80f 100644 --- a/src/gns/w32nsp.def +++ b/src/gns/w32nsp.def | |||
@@ -1,2 +1,2 @@ | |||
1 | NSPStartup | 1 | NSPStartup@8 |
2 | NSPCleanup | 2 | NSPCleanup@4 |