--- app/ControlSocket.cpp	2009-07-04 22:34:38.000000000 +0200
+++ app/ControlSocket.cpp	2009-07-04 22:35:53.000000000 +0200
@@ -28,6 +28,7 @@
 #include <sys/un.h>
 #include <csignal>
 #include <pwd.h>
+#include <climits>
 #include "control.h"
 #include "message.h"
 #include "Playlist.h"

--- input/flac/FlacPlugin.cpp	Mon Oct 29 22:00:16 2007
+++ input/flac/FlacPlugin.cpp	Thu Aug  6 13:42:44 2009
@@ -239,7 +239,7 @@
     else
     {
 	// use stream name
-	char * fname = strrchr (f->name ().c_str (), '/');
+	const char * fname = strrchr (f->name ().c_str (), '/');
 	if (fname)
 	{
 	    fname++;
@@ -270,7 +270,7 @@
 	if (strncmp(name, "http://", 7) == 0) {
 		return 0.0;
 	}
-	char *ext = strrchr(name, '.');
+	const char *ext = strrchr(name, '.');
 	if (!ext)
 		return 0.0;
 	ext++;