aboutsummaryrefslogtreecommitdiffstats
path: root/src/gos
diff options
context:
space:
mode:
authorJoel Bodenmann <joel@seriouslyembedded.com>2015-10-19 22:04:30 +0200
committerJoel Bodenmann <joel@seriouslyembedded.com>2015-10-19 22:04:30 +0200
commitda2ee2d7adbfd47c87a0a30a1fecec767386503c (patch)
treee793daf904375136b8684b6259eea6c78d1aeb02 /src/gos
parent3d618f8a7a55683c587399699891bb5a6880a0d3 (diff)
downloaduGFX-da2ee2d7adbfd47c87a0a30a1fecec767386503c.tar.gz
uGFX-da2ee2d7adbfd47c87a0a30a1fecec767386503c.tar.bz2
uGFX-da2ee2d7adbfd47c87a0a30a1fecec767386503c.zip
Fixing compiler warning "assignment in condition" (ARMCC)
Diffstat (limited to 'src/gos')
-rw-r--r--src/gos/gos_x_heap.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gos/gos_x_heap.c b/src/gos/gos_x_heap.c
index 94b74d37..e8faa02f 100644
--- a/src/gos/gos_x_heap.c
+++ b/src/gos/gos_x_heap.c
@@ -154,7 +154,8 @@
}
// We need to do this the hard way
- if ((new = gfxAlloc(sz)))
+ new = gfxAlloc(sz);
+ if (new)
return 0;
memcpy(new, ptr, p->sz - sizeof(memslot));
gfxFree(ptr);