diff options
| author | Steve Fryatt <steve@stevefryatt.org.uk> | 2010-12-19 10:33:14 +0000 |
|---|---|---|
| committer | Steve Fryatt <steve@stevefryatt.org.uk> | 2010-12-19 10:33:14 +0000 |
| commit | 6cc0f1b24b2c02c138b5459725747b219dd4bfbb (patch) | |
| tree | 9c0eedd22115c469f9f967d23ee701200035d460 /riscos/theme.h | |
| parent | de5cbf9ee4db1d19fab26781d0ead82f5a001e52 (diff) | |
| download | netsurf-6cc0f1b24b2c02c138b5459725747b219dd4bfbb.tar.gz netsurf-6cc0f1b24b2c02c138b5459725747b219dd4bfbb.tar.bz2 | |
Give macro expansion less potential for ambiguity.
svn path=/trunk/netsurf/; revision=11094
Diffstat (limited to 'riscos/theme.h')
| -rw-r--r-- | riscos/theme.h | 8 |
1 files changed, 4 insertions, 4 deletions
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 |