aboutsummaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
authorinmarket <andrewh@inmarket.com.au>2015-11-27 10:16:40 +1000
committerinmarket <andrewh@inmarket.com.au>2015-11-27 10:16:40 +1000
commitd60706032eed1d30d3546b39ff631013d1691251 (patch)
tree9eafa25cbf11d7006c3311bd41f44c2d59a2e89a /demos
parent0313756ea38d71cfce21a0a905f4fc43ac68d197 (diff)
downloaduGFX-d60706032eed1d30d3546b39ff631013d1691251.tar.gz
uGFX-d60706032eed1d30d3546b39ff631013d1691251.tar.bz2
uGFX-d60706032eed1d30d3546b39ff631013d1691251.zip
Fix frame demo so that malloc is emulated as rand() needs it on some platforms
Diffstat (limited to 'demos')
-rw-r--r--demos/modules/gwin/frame/gfxconf.h3
-rw-r--r--demos/modules/gwin/frame/main.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/demos/modules/gwin/frame/gfxconf.h b/demos/modules/gwin/frame/gfxconf.h
index c6dcd80f..0c14f6b4 100644
--- a/demos/modules/gwin/frame/gfxconf.h
+++ b/demos/modules/gwin/frame/gfxconf.h
@@ -24,6 +24,9 @@
//#define GFX_USE_OS_LINUX TRUE
//#define GFX_USE_OS_OSX TRUE
+// Oops - rand() seems to use malloc()
+#define GFX_EMULATE_MALLOC TRUE
+
///////////////////////////////////////////////////////////////////////////
// GDISP //
///////////////////////////////////////////////////////////////////////////
diff --git a/demos/modules/gwin/frame/main.c b/demos/modules/gwin/frame/main.c
index a97525ab..6668ddbb 100644
--- a/demos/modules/gwin/frame/main.c
+++ b/demos/modules/gwin/frame/main.c
@@ -1,5 +1,5 @@
#include "gfx.h"
-#include "stdio.h"
+#include <stdlib.h>
static GListener gl;
static GHandle ghFrame1;