5 files changed, 16 insertions, 16 deletions
diff --git a/src/unix/Daemon.cxx b/src/unix/Daemon.cxx
index 490b2def5..c3638cc80 100644
--- a/src/unix/Daemon.cxx
+++ b/src/unix/Daemon.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2014 The Music Player Daemon Project
+ * Copyright (C) 2003-2015 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -71,7 +71,7 @@ daemonize_kill(void)
 	if (pidfile.IsNull())
 		FatalError("no pid_file specified in the config file");
 
-	fp = FOpen(pidfile, "r");
+	fp = FOpen(pidfile, PATH_LITERAL("r"));
 	if (fp == nullptr) {
 		const std::string utf8 = pidfile.ToUTF8();
 		FormatFatalSystemError("Unable to open pid file \"%s\"",
diff --git a/src/unix/Daemon.hxx b/src/unix/Daemon.hxx
index fe5681511..5937705ce 100644
--- a/src/unix/Daemon.hxx
+++ b/src/unix/Daemon.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2014 The Music Player Daemon Project
+ * Copyright (C) 2003-2015 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -33,10 +33,10 @@ daemonize_init(const char *user, const char *group, AllocatedPath &&pidfile)
 
 #ifndef WIN32
 void
-daemonize_finish(void);
+daemonize_finish();
 #else
 static inline void
-daemonize_finish(void)
+daemonize_finish()
 { /* nop */ }
 #endif
 
@@ -46,11 +46,11 @@ daemonize_finish(void)
  */
 #ifndef WIN32
 void
-daemonize_kill(void);
+daemonize_kill();
 #else
 #include "system/FatalError.hxx"
 static inline void
-daemonize_kill(void)
+daemonize_kill()
 {
 	FatalError("--kill is not available on WIN32");
 }
@@ -61,10 +61,10 @@ daemonize_kill(void)
  */
 #ifndef WIN32
 void
-daemonize_close_stdin(void);
+daemonize_close_stdin();
 #else
 static inline void
-daemonize_close_stdin(void) {}
+daemonize_close_stdin() {}
 #endif
 
 /**
@@ -72,10 +72,10 @@ daemonize_close_stdin(void) {}
  */
 #ifndef WIN32
 void
-daemonize_set_user(void);
+daemonize_set_user();
 #else
 static inline void
-daemonize_set_user(void)
+daemonize_set_user()
 { /* nop */ }
 #endif
 
diff --git a/src/unix/PidFile.hxx b/src/unix/PidFile.hxx
index a242c7810..3c3d5ca21 100644
--- a/src/unix/PidFile.hxx
+++ b/src/unix/PidFile.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2014 The Music Player Daemon Project
+ * Copyright (C) 2003-2015 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -37,11 +37,11 @@ public:
 		if (path.IsNull())
 			return;
 
-		file = FOpen(path, "w");
+		file = FOpen(path, FOpenMode::WriteText);
 		if (file == nullptr) {
 			const std::string utf8 = path.ToUTF8();
 			FormatFatalSystemError("Failed to create pid file \"%s\"",
-					       path.c_str());
+					       utf8.c_str());
 		}
 	}
 
diff --git a/src/unix/SignalHandlers.cxx b/src/unix/SignalHandlers.cxx
index 4aef4fa71..47085b4fd 100644
--- a/src/unix/SignalHandlers.cxx
+++ b/src/unix/SignalHandlers.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2014 The Music Player Daemon Project
+ * Copyright (C) 2003-2015 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/unix/SignalHandlers.hxx b/src/unix/SignalHandlers.hxx
index 551b373c1..573db7511 100644
--- a/src/unix/SignalHandlers.hxx
+++ b/src/unix/SignalHandlers.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2014 The Music Player Daemon Project
+ * Copyright (C) 2003-2015 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify