aboutsummaryrefslogtreecommitdiffstats
path: root/src/options.h
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-10-03 14:25:45 +0200
committerMax Kellermann <max@duempel.org>2008-10-03 14:25:45 +0200
commit7e81521772240ec3567a1773d2919a3e90d104c7 (patch)
tree9f6346e662afe4617567a5904e28a832a87e7aef /src/options.h
parent88af2c3ace0fa42dbb816cc9fe8c4b54ce89233a (diff)
downloadmpd-7e81521772240ec3567a1773d2919a3e90d104c7.tar.gz
mpd-7e81521772240ec3567a1773d2919a3e90d104c7.tar.xz
mpd-7e81521772240ec3567a1773d2919a3e90d104c7.zip
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.
Diffstat (limited to 'src/options.h')
-rw-r--r--src/options.h6
1 files changed, 2 insertions, 4 deletions
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