diff --git a/source/lib/posix.h b/source/lib/posix.h index d3bfb65a15..a630a4b630 100755 --- a/source/lib/posix.h +++ b/source/lib/posix.h @@ -435,8 +435,8 @@ struct sockaddr_in6 { extern const struct in6_addr in6addr_any; /* :: */ extern const struct in6_addr in6addr_loopback; /* ::1 */ -#define IN6ADDR_ANY_INIT { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } } } -#define IN6ADDR_LOOPBACK_INIT { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } } } +#define IN6ADDR_ANY_INIT { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } +#define IN6ADDR_LOOPBACK_INIT { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } // // diff --git a/source/lib/zip.cpp b/source/lib/zip.cpp index e0f920a189..5d0d66a1f3 100755 --- a/source/lib/zip.cpp +++ b/source/lib/zip.cpp @@ -27,6 +27,12 @@ #include "mem.h" #include "vfs.h" +// don't include windows.h from zconf! +// not necessary, causes many conflicts. +#define _WINDOWS_ +#define WINAPI __stdcall +#define WINAPIV __cdecl + #include #ifdef _MSC_VER #pragma comment(lib, "zlib.lib")