wok-current view 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
line source
1 --- app/ControlSocket.cpp 2009-07-04 22:34:38.000000000 +0200
2 +++ app/ControlSocket.cpp 2009-07-04 22:35:53.000000000 +0200
3 @@ -28,6 +28,7 @@
4 #include <sys/un.h>
5 #include <csignal>
6 #include <pwd.h>
7 +#include <climits>
8 #include "control.h"
9 #include "message.h"
10 #include "Playlist.h"
11
12 --- input/flac/FlacPlugin.cpp Mon Oct 29 22:00:16 2007
13 +++ input/flac/FlacPlugin.cpp Thu Aug 6 13:42:44 2009
14 @@ -239,7 +239,7 @@
15 else
16 {
17 // use stream name
18 - char * fname = strrchr (f->name ().c_str (), '/');
19 + const char * fname = strrchr (f->name ().c_str (), '/');
20 if (fname)
21 {
22 fname++;
23 @@ -270,7 +270,7 @@
24 if (strncmp(name, "http://", 7) == 0) {
25 return 0.0;
26 }
27 - char *ext = strrchr(name, '.');
28 + const char *ext = strrchr(name, '.');
29 if (!ext)
30 return 0.0;
31 ext++;