diff options
| author | Tectu <joel@unormal.org> | 2013-03-07 06:58:15 -0800 |
|---|---|---|
| committer | Tectu <joel@unormal.org> | 2013-03-07 06:58:15 -0800 |
| commit | 93d506ef22faa162007607ff3ea614c981dc1654 (patch) | |
| tree | 80bac7750019b5b62ece31564ee8e34e66ceac30 /src | |
| parent | e315480c713cb6889c8329788d3dd69c9fbc6cf4 (diff) | |
| parent | ce5f3b3d701e7f6ac40fe5e06c5ac32562ba36c7 (diff) | |
| download | uGFX-93d506ef22faa162007607ff3ea614c981dc1654.tar.gz uGFX-93d506ef22faa162007607ff3ea614c981dc1654.tar.bz2 uGFX-93d506ef22faa162007607ff3ea614c981dc1654.zip | |
Merge pull request #40 from inmarket/master
Merge InMarket Changes
Diffstat (limited to 'src')
| -rw-r--r-- | src/gadc/gadc.c | 2 | ||||
| -rw-r--r-- | src/gwin/gwin.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gadc/gadc.c b/src/gadc/gadc.c index 183b9923..40b901ae 100644 --- a/src/gadc/gadc.c +++ b/src/gadc/gadc.c @@ -1,5 +1,5 @@ /* - ChibiOS/GFX - Copyright (C) 2012, 2013, 2013 + ChibiOS/GFX - Copyright (C) 2012, 2013 Joel Bodenmann aka Tectu <joel@unormal.org> This file is part of ChibiOS/GFX. diff --git a/src/gwin/gwin.c b/src/gwin/gwin.c index 33637d89..d7fb5726 100644 --- a/src/gwin/gwin.c +++ b/src/gwin/gwin.c @@ -109,7 +109,7 @@ void gwinDestroyWindow(GHandle gh) { chHeapFree((void *)((GButtonObject *)gh)->txt); } geventDetachSource(&((GButtonObject *)gh)->listener, 0); - geventDetachSourceListeners((GSourceHandle *)gh); + geventDetachSourceListeners((GSourceHandle)gh); break; #endif default: |