RISC OS: squash warnings from GCC 4.7

This commit is contained in:
John-Mark Bell 2015-02-25 00:32:46 +00:00
parent 9a2fe3d481
commit b051c037d3
2 changed files with 12 additions and 14 deletions

View File

@ -438,7 +438,7 @@ static void ro_gui_signal(int sig)
#else
/* Save WimpSlot and UnixLib managed DAs when UnixEnv$coredump
* defines a coredump directory. */
_kernel_oserror *err = __unixlib_write_coredump (NULL);
const _kernel_oserror *err = __unixlib_write_coredump (NULL);
if (err != NULL)
LOG(("Coredump failed: %s", err->errmess));
#endif

View File

@ -4878,9 +4878,10 @@ browser_mouse_state ro_gui_mouse_click_state(wimp_mouse_state buttons,
/* Need to consider what we have and decide whether to fire
* triple click instead */
switch (state) {
case BROWSER_MOUSE_PRESS_1 | BROWSER_MOUSE_CLICK_1:
case BROWSER_MOUSE_PRESS_2 | BROWSER_MOUSE_CLICK_2:
if ((state == (BROWSER_MOUSE_PRESS_1 |
BROWSER_MOUSE_CLICK_1)) ||
(state == (BROWSER_MOUSE_PRESS_2 |
BROWSER_MOUSE_CLICK_2))) {
/* WIMP told us single click, but maybe we want to call
* it a triple click */
@ -4899,12 +4900,12 @@ browser_mouse_state ro_gui_mouse_click_state(wimp_mouse_state buttons,
/* Single click */
last_click.type = CLICK_SINGLE;
}
break;
case BROWSER_MOUSE_PRESS_1 | BROWSER_MOUSE_CLICK_1 |
BROWSER_MOUSE_DOUBLE_CLICK:
case BROWSER_MOUSE_PRESS_2 | BROWSER_MOUSE_CLICK_2 |
BROWSER_MOUSE_DOUBLE_CLICK:
} else if ((state == (BROWSER_MOUSE_PRESS_1 |
BROWSER_MOUSE_CLICK_1 |
BROWSER_MOUSE_DOUBLE_CLICK)) ||
(state == (BROWSER_MOUSE_PRESS_2 |
BROWSER_MOUSE_CLICK_2 |
BROWSER_MOUSE_DOUBLE_CLICK))) {
/* Wimp told us double click, but we may want to
* call it single click */
@ -4915,11 +4916,8 @@ browser_mouse_state ro_gui_mouse_click_state(wimp_mouse_state buttons,
last_click.type = CLICK_DOUBLE;
last_click.time = wallclock();
}
break;
default:
} else {
last_click.type = CLICK_SINGLE;
break;
}
break;
}