Merge branch 'master' into next

[i3/i3] / include / config.h

diff --git a/include/config.h b/include/config.h
index 04f1c85f65ded1e8b1e088afe6a9aa2c6e300489..4a95d43fee8e7f25df2ce4979dc0c97595715f1e 100644 (file)
--- a/include/config.h
+++ b/include/config.h
@@ -6,8 +6,8 @@
  *
  * include/config.h: Contains all structs/variables for the configurable
  * part of i3 as well as functions handling the configuration file (calling
- * the parser (src/cfgparse.y) with the correct path, switching key bindings
- * mode).
+ * the parser (src/config_parse.c) with the correct path, switching key
+ * bindings mode).
  *
  */
 #ifndef I3_CONFIG_H
@@ -24,8 +24,6 @@ extern char *current_configpath;
 extern Config config;
 extern SLIST_HEAD(modes_head, Mode) modes;
 extern TAILQ_HEAD(barconfig_head, Barconfig) barconfigs;
-/* defined in src/cfgparse.y */
-extern bool force_old_config_parser;
 
 /**
  * Used during the config file lexing/parsing to keep the state of the lexer
@@ -342,7 +340,4 @@ Binding *get_binding(uint16_t modifiers, bool key_release, xcb_keycode_t keycode
  */
 void kill_configerror_nagbar(bool wait_for_it);
 
-/* prototype for src/cfgparse.y */
-void parse_file(const char *f);
-
 #endif