diff --git a/common/configopts.h b/common/configopts.h index 025be7c2e..68d53b64c 100644 --- a/common/configopts.h +++ b/common/configopts.h @@ -1,3 +1,4 @@ +#include #include "rules.h" #define AWESOME_CONFIG_FILE ".awesomerc" @@ -247,7 +248,7 @@ static cfg_opt_t mouse_opts[] = CFG_SEC((char *) "client", mouse_generic_opts, CFGF_MULTI), CFG_END() }; -static cfg_opt_t opts[] = +static cfg_opt_t awesome_opts[] = { CFG_SEC((char *) "screen", screen_opts, CFGF_TITLE | CFGF_MULTI | CFGF_NO_TITLE_DUPES), CFG_SEC((char *) "rules", rules_opts, CFGF_NONE), diff --git a/config.c b/config.c index c8663aa84..e9db2feab 100644 --- a/config.c +++ b/config.c @@ -452,7 +452,7 @@ config_check(const char *confpatharg) int ret; char *confpath; - cfg = cfg_init(opts, CFGF_NONE); + cfg = cfg_init(awesome_opts, CFGF_NONE); if(confpatharg) confpath = a_strdup(confpatharg); @@ -496,7 +496,7 @@ config_parse(const char *confpatharg) globalconf.configpath = a_strdup(confpath); - cfg = cfg_init(opts, CFGF_NONE); + cfg = cfg_init(awesome_opts, CFGF_NONE); ret = cfg_parse(cfg, confpath); @@ -516,7 +516,7 @@ config_parse(const char *confpatharg) { warn("using default compile-time configuration\n"); cfg_free(cfg); - cfg = cfg_init(opts, CFGF_NONE); + cfg = cfg_init(awesome_opts, CFGF_NONE); cfg_parse_buf(cfg, AWESOME_DEFAULT_CONFIG); }