diff options
| author | Joel Bodenmann <joel@seriouslyembedded.com> | 2015-11-27 20:39:28 +0100 |
|---|---|---|
| committer | Joel Bodenmann <joel@seriouslyembedded.com> | 2015-11-27 20:39:28 +0100 |
| commit | 5a99092b794373966e444296c57991631e712c70 (patch) | |
| tree | 3e2853ab9730ece7398f508238ac2707e485b346 /src/gos/gos_x_heap.c | |
| parent | eaf0b19fb8428b9e2e47798294d6ba83a56d186e (diff) | |
| parent | f16ee702727a811288749a0722ddb138dd559fa8 (diff) | |
| download | uGFX-5a99092b794373966e444296c57991631e712c70.tar.gz uGFX-5a99092b794373966e444296c57991631e712c70.tar.bz2 uGFX-5a99092b794373966e444296c57991631e712c70.zip | |
Merge branch 'master' of https://bitbucket.org/Tectu/ugfx
Diffstat (limited to 'src/gos/gos_x_heap.c')
| -rw-r--r-- | src/gos/gos_x_heap.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/gos/gos_x_heap.c b/src/gos/gos_x_heap.c index cd78f403..7e79d1c6 100644 --- a/src/gos/gos_x_heap.c +++ b/src/gos/gos_x_heap.c @@ -194,3 +194,14 @@ #endif #endif /* GOS_NEED_X_HEAP */ + +#if GFX_EMULATE_MALLOC + #include <stdlib.h> + + void* malloc(size_t size) { + return gfxAlloc(size); + } + void free(void *ptr) { + gfxFree(ptr); + } +#endif |