uGFX
/
ugfx
2
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

ugfx_release_2.6
inmarket 2015-07-08 09:31:22 +10:00
parent d7624145b6 e99cc3cd8b
commit af2b0f29b5
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gos/gos_arduino.c
View File

@ -327,7 +327,7 @@ static thread *Qpop(threadQ * q) {
/* These functions are not static to prevent the compiler removing them as functions */ /* These functions are not static to prevent the compiler removing them as functions */
void get_stack_state(void) { void get_stack_state(void) {
char c; char* c;
pframeinfo->localptr = (char *)&c; pframeinfo->localptr = (char *)&c;
_setjmp(pframeinfo->cxt); _setjmp(pframeinfo->cxt);
} }

2
src/gos/gos_raw32.c
View File

@ -526,7 +526,7 @@ static thread *Qpop(threadQ * q) {
/* These functions are not static to prevent the compiler removing them as functions */ /* These functions are not static to prevent the compiler removing them as functions */
void get_stack_state(void) { void get_stack_state(void) {
char c; char* c;
pframeinfo->localptr = (char *)&c; pframeinfo->localptr = (char *)&c;
_setjmp(pframeinfo->cxt); _setjmp(pframeinfo->cxt);
} }

2
src/gwin/gwin.h
View File

@ -469,7 +469,7 @@ extern "C" {
#if GWIN_NEED_WINDOWMANAGER || defined (__DOXYGEN__) #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] 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 * @param[in] preserve Should the redraw try to preserve existing screen data for those