From dddb55d77700b7239c0ab1405176ad5bf570097d Mon Sep 17 00:00:00 2001 From: Sergey Bogolepov Date: Wed, 13 Feb 2019 19:02:55 +0700 Subject: [PATCH] Update mingw_x86 toolchain version and add missing macros to mingw/posix.def --- konan/konan.properties | 6 +++--- platformLibs/src/platform/mingw/posix.def | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/konan/konan.properties b/konan/konan.properties index 40594b48389..cce8c1ccd86 100644 --- a/konan/konan.properties +++ b/konan/konan.properties @@ -359,14 +359,14 @@ dependencies.mingw_x64 = \ libffi-3.2.1-mingw-w64-x86-64 # Windows i686, based on mingw-w64. -targetToolchain.mingw_x64-mingw_x86 = msys2-mingw-w64-i686-gcc-7.3.0-clang-llvm-lld-6.0.1 +targetToolchain.mingw_x64-mingw_x86 = msys2-mingw-w64-i686-gcc-7.4.0-clang-llvm-6.0.1 dependencies.mingw_x64-mingw_x86 = \ - msys2-mingw-w64-i686-gcc-7.3.0-clang-llvm-lld-6.0.1 \ + msys2-mingw-w64-i686-gcc-7.4.0-clang-llvm-6.0.1 \ msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1 \ libffi-3.2.1-mingw-w64-x86-64 quadruple.mingw_x86 = i686-w64-mingw32 -targetSysRoot.mingw_x86 = msys2-mingw-w64-i686-gcc-7.3.0-clang-llvm-lld-6.0.1 +targetSysRoot.mingw_x86 = msys2-mingw-w64-i686-gcc-7.4.0-clang-llvm-6.0.1 # For using with Universal Windows Platform (UWP) we need to use this slower option. # See https://youtrack.jetbrains.com/issue/KT-27654. # TODO: remove, once fixed in mingw, check with the bug testcase. diff --git a/platformLibs/src/platform/mingw/posix.def b/platformLibs/src/platform/mingw/posix.def index 22957044dad..20061371f11 100644 --- a/platformLibs/src/platform/mingw/posix.def +++ b/platformLibs/src/platform/mingw/posix.def @@ -43,6 +43,7 @@ static short posix_htons(short x) { #define LPWORD WORD* #define LPLONG __LONG32* #define LPDWORD DWORD* +#define LPTSTR WCHAR* #define VOID void #define PVOID void* #define LPVOID void* @@ -56,6 +57,7 @@ static short posix_htons(short x) { #define FARPROC void* #define WINAPI __stdcall #define CALLBACK __stdcall +#define PASCAL __pascal #define _INC_WINDOWS #define RPC_NO_WINDOWS_H