Merge pull request #13032 from ijean:mingw-w64-build

This commit is contained in:
Alexander Alekhin 2018-11-06 16:26:56 +00:00
commit 835e4b6de9

View File

@ -99,6 +99,19 @@ static const char* trackbar_text =
#define WM_MOUSEHWHEEL 0x020E #define WM_MOUSEHWHEEL 0x020E
#endif #endif
#if defined(__MINGW32__) || defined(__MINGW64__)
static inline void mingw_strcpy_s(char *dest, size_t destsz, const char *src){
strcpy(dest, src);
}
static inline void mingw_strcat_s(char *dest, size_t destsz, const char *src){
strcat(dest, src);
}
#define strcpy_s mingw_strcpy_s
#define strcat_s mingw_strcat_s
#endif
static void FillBitmapInfo( BITMAPINFO* bmi, int width, int height, int bpp, int origin ) static void FillBitmapInfo( BITMAPINFO* bmi, int width, int height, int bpp, int origin )
{ {
assert( bmi && width >= 0 && height >= 0 && (bpp == 8 || bpp == 24 || bpp == 32)); assert( bmi && width >= 0 && height >= 0 && (bpp == 8 || bpp == 24 || bpp == 32));