diff --git a/include/freerdp/secondary.h b/include/freerdp/secondary.h index b4c3138cf..382b3222b 100644 --- a/include/freerdp/secondary.h +++ b/include/freerdp/secondary.h @@ -49,12 +49,14 @@ #define BS_PATTERN 0x03 #endif -#define HS_HORIZONTAL 0x00 +#ifndef _WIN32 +#define HS_HORIZONTAL 0x00 #define HS_VERTICAL 0x01 -#define HS_FDIAGONAL 0x02 -#define HS_BDIAGONAL 0x03 +#define HS_FDIAGONAL 0x02 +#define HS_BDIAGONAL 0x03 #define HS_CROSS 0x04 -#define HS_DIAGCROSS 0x05 +#define HS_DIAGCROSS 0x05 +#endif #define SO_FLAG_DEFAULT_PLACEMENT 0x01 #define SO_HORIZONTAL 0x02 diff --git a/libfreerdp-utils/thread.c b/libfreerdp-utils/thread.c index 4dfdd5936..d6b3b0b33 100644 --- a/libfreerdp-utils/thread.c +++ b/libfreerdp-utils/thread.c @@ -24,6 +24,9 @@ #ifdef _WIN32 #include +#ifdef _MSC_VER +#include +#endif #endif #include @@ -49,8 +52,11 @@ void freerdp_thread_start(freerdp_thread* thread, void* func, void* arg) #ifdef _WIN32 { - DWORD th; - CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)func, arg, 0, &th); +# ifdef _MSC_VER + CloseHandle((HANDLE)_beginthreadex(NULL, 0, func, arg, 0, NULL)); +#else + CloseHandle(CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)func, arg, 0, NULL)); +#endif } #else {