From 9bd296987684788c32dd346b2d67671ed5dfe7a0 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Sat, 1 Jun 2013 16:05:51 +0100 Subject: [PATCH] amiga is the only user of the very odd usage of the options API --- amiga/gui.c | 6 ++++++ utils/nsoption.h | 11 ----------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/amiga/gui.c b/amiga/gui.c index 4ec0ea1d7..a26c0f7f7 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -196,6 +196,12 @@ static void ami_gui_window_update_box_deferred(struct gui_window *g, bool draw); static void ami_do_redraw(struct gui_window_2 *g); static void ami_schedule_redraw_remove(struct gui_window_2 *gwin); +/* accessors for default options - user option is updated if it is set as per default */ +#define nsoption_default_set_int(OPTION, VALUE) \ + if (nsoptions_default[NSOPTION_##OPTION].value.i == nsoptions[NSOPTION_##OPTION].value.i) \ + nsoptions[NSOPTION_##OPTION].value.i = VALUE; \ + nsoptions_default[NSOPTION_##OPTION].value.i = VALUE + STRPTR ami_locale_langs(void) { struct Locale *locale; diff --git a/utils/nsoption.h b/utils/nsoption.h index bafcfb95a..15ecee3c9 100644 --- a/utils/nsoption.h +++ b/utils/nsoption.h @@ -270,15 +270,4 @@ int nsoption_snoptionf(char *string, size_t size, enum nsoption_e option, const } \ } while (0) -/* accessors for default options - user option is updated if it is set as per default */ -#define nsoption_default_set_int(OPTION, VALUE) \ - if (nsoptions_default[NSOPTION_##OPTION].value.i == nsoptions[NSOPTION_##OPTION].value.i) \ - nsoptions[NSOPTION_##OPTION].value.i = VALUE; \ - nsoptions_default[NSOPTION_##OPTION].value.i = VALUE - -#define nsoption_default_set_colour(OPTION, VALUE) \ - if (nsoptions_default[NSOPTION_##OPTION].value.c == nsoptions[NSOPTION_##OPTION].value.c) \ - nsoptions[NSOPTION_##OPTION].value.c = VALUE; \ - nsoptions_default[NSOPTION_##OPTION].value.c = VALUE - #endif