diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2018-08-19 12:40:38 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2018-08-19 12:40:38 +0200 |
| commit | 0184742fd6dda45b4c3ac2f26eb60ec9a8ccedf3 (patch) | |
| tree | 22f6f68aeeabfb590fc2a0cbb9e5c4ab5dba5ba8 | |
| parent | c1b7409de9bfd0c63c662b38b007d99dbb442d38 (diff) | |
| download | arts-0184742f.tar.gz arts-0184742f.zip | |
Fix FTBFS with stricter C++11
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
| -rw-r--r-- | mcop/tcpserver.cc | 2 | ||||
| -rw-r--r-- | mcop/unixserver.cc | 2 | ||||
| -rw-r--r-- | soundserver/gslplayobject_impl.cc | 2 | ||||
| -rw-r--r-- | soundserver/wavplayobject_impl.cc | 2 |
4 files changed, 4 insertions, 4 deletions
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() { |