uGFX/ugfx
2
0
Fork 0
Code Issues 2 Pull requests Projects Releases Wiki Activity

New versions of mingw use Red, Green Blue so we need to undefine them in certain places.

Browse source 
This should really be fixed by renaming Red, Green, Blue as the names are too common however this would create compatibility problems.
This commit is contained in:
inmarket 2013-12-11 00:38:42 +10:00
parent da8a79bd24
commit 4dc9bf34a7
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/multiple/Win32/gdisp_lld_Win32.c
View file

@ -42,6 +42,11 @@
#define DISPLAY_X_OFFSET 50 #define DISPLAY_X_OFFSET 50
#define DISPLAY_Y_OFFSET 50 #define DISPLAY_Y_OFFSET 50
#undef Red
#undef Green
#undef Blue
#define WIN32_LEAN_AND_MEAN
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
@ -420,7 +425,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
// Wait for our thread to be ready // Wait for our thread to be ready
while (!QReady) while (!QReady)
Sleep(1); gfxSleepMilliseconds(1);
} }
// Initialise the GDISP structure // Initialise the GDISP structure
@ -461,7 +466,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
// Wait for the window creation to complete (for safety) // Wait for the window creation to complete (for safety)
while(!(((volatile GDisplay *)g)->flags & GDISP_FLG_READY)) while(!(((volatile GDisplay *)g)->flags & GDISP_FLG_READY))
Sleep(1); gfxSleepMilliseconds(1);
sprintf(buf, APP_NAME " - %u", g->systemdisplay+1); sprintf(buf, APP_NAME " - %u", g->systemdisplay+1);
SetWindowText(priv->hwnd, buf); SetWindowText(priv->hwnd, buf);