aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Bodenmann <joel@seriouslyembedded.com>2015-10-19 22:22:50 +0200
committerJoel Bodenmann <joel@seriouslyembedded.com>2015-10-19 22:22:50 +0200
commit16d1323d59ebf30909222a2d663c4c1f52de8362 (patch)
tree497c543388582f033ba38b947463ed78d892334e
parent4b31f87fc8bde205ce1d331234dee768bac36af5 (diff)
downloaduGFX-16d1323d59ebf30909222a2d663c4c1f52de8362.tar.gz
uGFX-16d1323d59ebf30909222a2d663c4c1f52de8362.tar.bz2
uGFX-16d1323d59ebf30909222a2d663c4c1f52de8362.zip
Fixing compiler warning "assignment in condition" (ARMCC)
-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);