wininet: Include system headers before winsock2.h in http.c.

Alexandre Julliard julliard at winehq.org
Wed Jun 15 22:31:29 CDT 2016


Jacek Caban <jacek at codeweavers.com> writes:

> Fixes compilation on NetBSD, where zlib.h doesn't include stdlib.h.
>
> Signed-off-by: Jacek Caban <jacek at codeweavers.com>
> ---
>  dlls/wininet/http.c | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)

This breaks the mingw build:

In file included from ../../../wine/include/winsock2.h:47:0,
                 from ../../../wine/dlls/wininet/http.c:42:
../../../wine/include/winsock.h:445:19: error: redefinition of ‘struct timeval’
../../../wine/include/winsock.h:136:19: note: in definition of macro ‘WS’
In file included from /usr/share/mingw-w64/include/time.h:246:0,
                 from ../../../wine/dlls/wininet/http.c:39:
/usr/share/mingw-w64/include/_timeval.h:10:8: note: originally defined here
Makefile:296: recipe for target 'http.o' failed

-- 
Alexandre Julliard
julliard at winehq.org



More information about the wine-devel mailing list