diff options
| author | inmarket <andrewh@inmarket.com.au> | 2015-07-08 09:31:22 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2015-07-08 09:31:22 +1000 |
| commit | af2b0f29b5bba91e4f7be7eb29d27a345b305758 (patch) | |
| tree | 59284defbfa77215a4685e8c4c0bbc3ac6d45302 | |
| parent | d7624145b60113f9fba24ff284d716965b267b90 (diff) | |
| parent | e99cc3cd8b402d26bb2ed1abc1c8793f7a680d2f (diff) | |
| download | uGFX-af2b0f29b5bba91e4f7be7eb29d27a345b305758.tar.gz uGFX-af2b0f29b5bba91e4f7be7eb29d27a345b305758.tar.bz2 uGFX-af2b0f29b5bba91e4f7be7eb29d27a345b305758.zip | |
Merge remote-tracking branch 'origin/master'
| -rw-r--r-- | src/gos/gos_arduino.c | 2 | ||||
| -rw-r--r-- | src/gos/gos_raw32.c | 2 | ||||
| -rw-r--r-- | src/gwin/gwin.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/gos/gos_arduino.c b/src/gos/gos_arduino.c index 60c35cac..4c01695a 100644 --- a/src/gos/gos_arduino.c +++ b/src/gos/gos_arduino.c @@ -327,7 +327,7 @@ static thread *Qpop(threadQ * q) { /* These functions are not static to prevent the compiler removing them as functions */ void get_stack_state(void) { - char c; + char* c; pframeinfo->localptr = (char *)&c; _setjmp(pframeinfo->cxt); } diff --git a/src/gos/gos_raw32.c b/src/gos/gos_raw32.c index 7a80dd0e..7aa88b2a 100644 --- a/src/gos/gos_raw32.c +++ b/src/gos/gos_raw32.c @@ -526,7 +526,7 @@ static thread *Qpop(threadQ * q) { /* These functions are not static to prevent the compiler removing them as functions */ void get_stack_state(void) { - char c; + char* c; pframeinfo->localptr = (char *)&c; _setjmp(pframeinfo->cxt); } diff --git a/src/gwin/gwin.h b/src/gwin/gwin.h index 9b2d18b7..4a7d02bf 100644 --- a/src/gwin/gwin.h +++ b/src/gwin/gwin.h @@ -469,7 +469,7 @@ extern "C" { #if GWIN_NEED_WINDOWMANAGER || defined (__DOXYGEN__) /** - * @brief Redraw a window + * @brief Redraw a display * * @param[in] g The display to redraw. Passing NULL will redraw all displays. * @param[in] preserve Should the redraw try to preserve existing screen data for those |