From 6cc0f1b24b2c02c138b5459725747b219dd4bfbb Mon Sep 17 00:00:00 2001 From: Steve Fryatt Date: Sun, 19 Dec 2010 10:33:14 +0000 Subject: Give macro expansion less potential for ambiguity. svn path=/trunk/netsurf/; revision=11094 --- riscos/theme.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'riscos/theme.h') diff --git a/riscos/theme.h b/riscos/theme.h index 1bc9de07c..eb96d2c6b 100644 --- a/riscos/theme.h +++ b/riscos/theme.h @@ -174,10 +174,10 @@ int ro_gui_theme_height_change(struct toolbar *toolbar); struct toolbar_icon *ro_gui_theme_toolbar_get_icon(struct toolbar *toolbar, int x, int y); -#define ro_gui_theme_toolbar_height(toolbar) toolbar->height + \ +#define ro_gui_theme_toolbar_height(toolbar) (toolbar->height + \ (toolbar->editor ? toolbar->editor->height : 0) > toolbar->max_height ? \ toolbar->max_height : toolbar->height + \ - (toolbar->editor ? toolbar->editor->height : 0) -#define ro_gui_theme_toolbar_full_height(toolbar) toolbar->height + \ - (toolbar->editor ? toolbar->editor->height : 0) + (toolbar->editor ? toolbar->editor->height : 0)) +#define ro_gui_theme_toolbar_full_height(toolbar) (toolbar->height + \ + (toolbar->editor ? toolbar->editor->height : 0)) #endif -- cgit v1.2.3