diff --git a/src/conf.h b/src/conf.h
index d18eeff93752ef10b5a874d4b0b33158884fccdc..d3a26949a14b48df169e81d9b9bcb88deef7f96c 100644 (file)
--- a/src/conf.h
+++ b/src/conf.h
-/*
- * (c) 2004-2008 The Music Player Daemon Project
- * http://www.musicpd.org/
+/* ncmpc (Ncurses MPD Client)
+ * (c) 2004-2017 The Music Player Daemon Project
+ * Project homepage: http://musicpd.org
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
*/
-#include "options.h"
+#include <stdbool.h>
-int check_user_conf_dir(void);
+bool
+check_user_conf_dir(void);
-char *get_user_key_binding_filename(void);
+char *build_user_conf_filename(void);
+char *build_system_conf_filename(void);
-int read_configuration(void);
+char *build_user_key_binding_filename(void);
+
+void read_configuration(void);