diff options
| author | Paul Shamray <pashamray@gmail.com> | 2014-07-12 11:04:08 +0300 |
|---|---|---|
| committer | Paul Shamray <pashamray@gmail.com> | 2014-07-12 11:04:08 +0300 |
| commit | 1cda0bc1810f3d89ff38572abdf8cdf00a4ef91b (patch) | |
| tree | a6d12287acddd8c7f427bde4e0ad06c4a280b420 /src/gos | |
| parent | 94bc703fe24996b063d8f800a485a26a04f0d234 (diff) | |
| parent | cae7b197b38ec33b92bab5554ce2156867ae45d5 (diff) | |
| download | uGFX-1cda0bc1810f3d89ff38572abdf8cdf00a4ef91b.tar.gz uGFX-1cda0bc1810f3d89ff38572abdf8cdf00a4ef91b.tar.bz2 uGFX-1cda0bc1810f3d89ff38572abdf8cdf00a4ef91b.zip | |
Merged master into pcf8812
Diffstat (limited to 'src/gos')
| -rw-r--r-- | src/gos/ecos.h | 2 | ||||
| -rw-r--r-- | src/gos/sys_make.mk | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/gos/ecos.h b/src/gos/ecos.h index c24f3824..be9037b6 100644 --- a/src/gos/ecos.h +++ b/src/gos/ecos.h @@ -73,7 +73,7 @@ void gfxSleepMilliseconds(delaytime_t ms); void gfxSleepMicroseconds(delaytime_t ms); #define gfxAlloc(sz) malloc(sz) -#define gfxFree(ptr) free(sz) +#define gfxFree(ptr) free(ptr) #define gfxRealloc(ptr, oldsz, newsz) realloc(ptr, newsz) #define gfxSystemLock() cyg_scheduler_lock() diff --git a/src/gos/sys_make.mk b/src/gos/sys_make.mk index 8ef22121..9e24f875 100644 --- a/src/gos/sys_make.mk +++ b/src/gos/sys_make.mk @@ -4,4 +4,5 @@ GFXSRC += $(GFXLIB)/src/gos/chibios.c \ $(GFXLIB)/src/gos/linux.c \ $(GFXLIB)/src/gos/osx.c \ $(GFXLIB)/src/gos/raw32.c \ + $(GFXLIB)/src/gos/ecos.c |