From 7e81521772240ec3567a1773d2919a3e90d104c7 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 3 Oct 2008 14:25:45 +0200 Subject: options: don't pass the "options" pointer around Just make everybody use the global "options" variable. This eliminates namespace confusion and the NO_GLOBAL_OPTIONS hack. --- src/options.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/options.h') diff --git a/src/options.h b/src/options.h index e7e9e8f4c..0f9fa13c1 100644 --- a/src/options.h +++ b/src/options.h @@ -45,11 +45,9 @@ typedef struct { bool welcome_screen_list; } options_t; -#ifndef NO_GLOBAL_OPTIONS extern options_t options; -#endif -options_t *options_init(void); -options_t *options_parse(int argc, const char **argv); +void options_init(void); +void options_parse(int argc, const char **argv); #endif -- cgit v1.2.3