Give macro expansion less potential for ambiguity.

svn path=/trunk/netsurf/; revision=11094
This commit is contained in:
Steve Fryatt 2010-12-19 10:33:14 +00:00
parent de5cbf9ee4
commit 6cc0f1b24b
1 changed files with 4 additions and 4 deletions

View File

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