1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
|
diff --git a/mcop/tcpserver.cc b/mcop/tcpserver.cc
index 5ce3532..c2cffee 100644
--- a/mcop/tcpserver.cc
+++ b/mcop/tcpserver.cc
@@ -121,7 +121,7 @@ bool TCPServer::initSocket()
socket_addr.sin_family = AF_INET;
socket_addr.sin_port = htons( TCPServerPort ); // 0 = choose port freely
socket_addr.sin_addr.s_addr = htonl( inet_addr("0.0.0.0") );
- if ( bind( theSocket, (struct sockaddr *) &socket_addr,
+ if ( ::bind( theSocket, (struct sockaddr *) &socket_addr,
sizeof(struct sockaddr_in) ) < 0 )
{
arts_warning("MCOP TCPServer: can't bind to port/address");
diff --git a/mcop/unixserver.cc b/mcop/unixserver.cc
index acb3496..d70fe8e 100644
--- a/mcop/unixserver.cc
+++ b/mcop/unixserver.cc
@@ -98,7 +98,7 @@ bool UnixServer::initSocket(const string& serverID)
xserverpath = socket_addr.sun_path;
- if ( bind( theSocket, (struct sockaddr *) &socket_addr,
+ if ( ::bind( theSocket, (struct sockaddr *) &socket_addr,
sizeof(struct sockaddr_un) ) < 0 )
{
arts_warning("MCOP UnixServer: can't bind to file \"%s\"",
diff --git a/soundserver/gslplayobject_impl.cc b/soundserver/gslplayobject_impl.cc
index 217fe80..aafb41c 100644
--- a/soundserver/gslplayobject_impl.cc
+++ b/soundserver/gslplayobject_impl.cc
@@ -134,7 +134,7 @@ public:
*/
std::string description()
{
- return "no description available (see "__FILE__")";
+ return "no description available (see " __FILE__ ")";
}
poTime currentTime()
diff --git a/soundserver/wavplayobject_impl.cc b/soundserver/wavplayobject_impl.cc
index 6109f7c..8f5f2f1 100644
--- a/soundserver/wavplayobject_impl.cc
+++ b/soundserver/wavplayobject_impl.cc
@@ -74,7 +74,7 @@ public:
* KMedia2 interface
*/
string description() {
- return "no description (see "__FILE__")";
+ return "no description (see " __FILE__ ")";
}
poTime currentTime() {
|
