Merge remote-tracking branch 'origin/master'

ugfx_release_2.6
inmarket 2015-07-08 09:31:22 +10:00
commit af2b0f29b5
3 changed files with 3 additions and 3 deletions

View File

@ -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);
}

View File

@ -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);
}

View File

@ -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