Re: [2/2] winhttp: Implement WINHTTP_OPTION_CONNECTION_INFO.

[Alexandre Julliard]

Hans Leidekker  writes:
> @@ -25,6 +25,9 @@
>
> #include "windef.h"
>  #include "winbase.h"
> +#define USE_WS_PREFIX
> +#include "winsock2.h"
> +#include "ws2ipdef.h"
>  #include "winhttp.h"
>  #include "wincrypt.h"
>  #include "winreg.h"

This breaks the Mingw build here:

In file included from ../../../wine/dlls/winhttp/session.c:39:0:
../../../wine/dlls/winhttp/winhttp_private.h:124:29: error: field ‘sockaddr’ has incomplete type
../../../wine/dlls/winhttp/winhttp_private.h:230:49: warning: ‘struct sockaddr’ declared inside parameter list [enabled by default]
../../../wine/dlls/winhttp/winhttp_private.h:230:49: warning: its scope is only this definition or declaration, which is probably not what you want [enabled by default]
../../../wine/dlls/winhttp/winhttp_private.h:238:66: error: unknown type name ‘socklen_t’
../../../wine/dlls/winhttp/session.c:594:44: warning: ‘struct sockaddr’ declared inside parameter list [enabled by default]
../../../wine/dlls/winhttp/session.c: In function ‘convert_sockaddr’:
../../../wine/dlls/winhttp/session.c:596:21: error: dereferencing pointer to incomplete type
../../../wine/dlls/winhttp/session.c:598:10: error: ‘AF_INET’ undeclared (first use in this function)
../../../wine/dlls/winhttp/session.c:598:10: note: each undeclared identifier is reported only once for each function it appears in
../../../wine/dlls/winhttp/session.c:604:39: error: dereferencing pointer to incomplete type
../../../wine/dlls/winhttp/session.c:605:48: error: dereferencing pointer to incomplete type
../../../wine/dlls/winhttp/session.c:609:10: error: ‘AF_INET6’ undeclared (first use in this function)
../../../wine/dlls/winhttp/session.c:615:40: error: dereferencing pointer to incomplete type
../../../wine/dlls/winhttp/session.c:616:44: error: dereferencing pointer to incomplete type
../../../wine/dlls/winhttp/session.c:617:49: error: dereferencing pointer to incomplete type
../../../wine/dlls/winhttp/session.c:627:283: error: dereferencing pointer to incomplete type
../../../wine/dlls/winhttp/session.c: In function ‘request_query_option’:
../../../wine/dlls/winhttp/session.c:731:25: error: storage size of ‘local’ isn’t known
../../../wine/dlls/winhttp/session.c:732:9: error: unknown type name ‘socklen_t’
../../../wine/dlls/winhttp/session.c:746:9: warning: implicit declaration of function ‘getsockname’ [-Wimplicit-function-declaration]
../../../wine/dlls/winhttp/session.c:748:9: warning: passing argument 1 of ‘convert_sockaddr’ from incompatible pointer type [enabled by default]
../../../wine/dlls/winhttp/session.c:594:13: note: expected ‘const struct sockaddr *’ but argument is of type ‘const struct sockaddr *’
../../../wine/dlls/winhttp/session.c:731:25: warning: unused variable ‘local’ [-Wunused-variable]
../../../wine/dlls/winhttp/session.c: At top level:
../../../wine/dlls/winhttp/session.c:1230:63: warning: ‘struct sockaddr_in’ declared inside parameter list [enabled by default]
../../../wine/dlls/winhttp/session.c: In function ‘printf_addr’:
../../../wine/dlls/winhttp/session.c:1233:15: warning: implicit declaration of function ‘ntohl’ [-Wimplicit-function-declaration]
../../../wine/dlls/winhttp/session.c:1233:41: error: dereferencing pointer to incomplete type
../../../wine/dlls/winhttp/session.c:1234:41: error: dereferencing pointer to incomplete type
../../../wine/dlls/winhttp/session.c:1235:41: error: dereferencing pointer to incomplete type
../../../wine/dlls/winhttp/session.c:1236:41: error: dereferencing pointer to incomplete type
../../../wine/dlls/winhttp/session.c: At top level:
../../../wine/dlls/winhttp/session.c:1239:41: warning: ‘struct addrinfo’ declared inside parameter list [enabled by default]
../../../wine/dlls/winhttp/session.c:1248:66: warning: ‘struct addrinfo’ declared inside parameter list [enabled by default]
../../../wine/dlls/winhttp/session.c: In function ‘build_wpad_url’:
../../../wine/dlls/winhttp/session.c:1252:15: error: ‘NI_MAXHOST’ undeclared (first use in this function)
../../../wine/dlls/winhttp/session.c:1256:20: error: dereferencing pointer to incomplete type
../../../wine/dlls/winhttp/session.c:1256:35: error: ‘AF_INET’ undeclared (first use in this function)
../../../wine/dlls/winhttp/session.c:1256:48: error: dereferencing pointer to incomplete type
../../../wine/dlls/winhttp/session.c:1256:63: error: ‘AF_INET6’ undeclared (first use in this function)
../../../wine/dlls/winhttp/session.c:1256:80: error: dereferencing pointer to incomplete type
../../../wine/dlls/winhttp/session.c:1259:5: warning: passing argument 1 of ‘reverse_lookup’ from incompatible pointer type [enabled by default]
../../../wine/dlls/winhttp/session.c:1239:12: note: expected ‘const struct addrinfo *’ but argument is of type ‘const struct addrinfo *’
../../../wine/dlls/winhttp/session.c:1252:10: warning: unused variable ‘name’ [-Wunused-variable]
../../../wine/dlls/winhttp/session.c: At top level:
../../../wine/dlls/winhttp/session.c:1205:14: warning: ‘get_computer_name’ defined but not used [-Wunused-function]
../../../wine/dlls/winhttp/session.c:1221:13: warning: ‘is_domain_suffix’ defined but not used [-Wunused-function]
../../../wine/dlls/winhttp/session.c:1230:13: warning: ‘printf_addr’ defined but not used [-Wunused-function]
../../../wine/dlls/winhttp/session.c:1248:15: warning: ‘build_wpad_url’ defined but not used [-Wunused-function]
../../../wine/dlls/winhttp/session.c: In function ‘convert_sockaddr’:
../../../wine/dlls/winhttp/session.c:630:1: warning: control reaches end of non-void function [-Wreturn-type]
make[1]: *** [session.o] Error 1