wok-current annotate alsaplayer/stuff/gcc44.patch @ rev 15205

hg merge
author Aleksej Bobylev <al.bobylev@gmail.com>
date Mon Sep 09 03:32:26 2013 +0300 (2013-09-09)
parents
children
rev   line source
pankso@3816 1 --- app/ControlSocket.cpp 2009-07-04 22:34:38.000000000 +0200
pankso@3816 2 +++ app/ControlSocket.cpp 2009-07-04 22:35:53.000000000 +0200
pankso@3816 3 @@ -28,6 +28,7 @@
pankso@3816 4 #include <sys/un.h>
pankso@3816 5 #include <csignal>
pankso@3816 6 #include <pwd.h>
pankso@3816 7 +#include <climits>
pankso@3816 8 #include "control.h"
pankso@3816 9 #include "message.h"
pankso@3816 10 #include "Playlist.h"
pankso@3816 11
pankso@3816 12 --- input/flac/FlacPlugin.cpp Mon Oct 29 22:00:16 2007
pankso@3816 13 +++ input/flac/FlacPlugin.cpp Thu Aug 6 13:42:44 2009
pankso@3816 14 @@ -239,7 +239,7 @@
pankso@3816 15 else
pankso@3816 16 {
pankso@3816 17 // use stream name
pankso@3816 18 - char * fname = strrchr (f->name ().c_str (), '/');
pankso@3816 19 + const char * fname = strrchr (f->name ().c_str (), '/');
pankso@3816 20 if (fname)
pankso@3816 21 {
pankso@3816 22 fname++;
pankso@3816 23 @@ -270,7 +270,7 @@
pankso@3816 24 if (strncmp(name, "http://", 7) == 0) {
pankso@3816 25 return 0.0;
pankso@3816 26 }
pankso@3816 27 - char *ext = strrchr(name, '.');
pankso@3816 28 + const char *ext = strrchr(name, '.');
pankso@3816 29 if (!ext)
pankso@3816 30 return 0.0;
pankso@3816 31 ext++;