x11/nxcomp: Fix build with Clang 6
Loop.cpp:6751:61: error: invalid operands to binary expression ('__bind<int &, sockaddr *, unsigned long>' and 'int') if (bind(proxyFD, (sockaddr *) &tcpAddr, sizeof(tcpAddr)) == -1) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~ /usr/include/c++/v1/system_error:577:1: note: candidate function not viable: no known conversion from '__bind<int &, sockaddr *, unsigned long>' to 'const std::__1::error_code' for 1st argument operator==(const error_code& __x, const error_code& __y) _NOEXCEPT ^ http://beefy12.nyi.freebsd.org/data/head-amd64-default/p473790_s335878/logs/nxcomp-3.5.0.32.log
This commit is contained in:
parent
17ed645ed4
commit
75c7562c9d
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=474114
1 changed files with 45 additions and 0 deletions
45
x11/nxcomp/files/patch-Loop.cpp
Normal file
45
x11/nxcomp/files/patch-Loop.cpp
Normal file
|
@ -0,0 +1,45 @@
|
|||
Loop.cpp:6751:61: error: invalid operands to binary expression ('__bind<int &, sockaddr *, unsigned long>' and 'int')
|
||||
if (bind(proxyFD, (sockaddr *) &tcpAddr, sizeof(tcpAddr)) == -1)
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~
|
||||
/usr/include/c++/v1/system_error:577:1: note: candidate function not viable: no known conversion from '__bind<int &, sockaddr *, unsigned long>' to 'const std::__1::error_code' for 1st argument
|
||||
operator==(const error_code& __x, const error_code& __y) _NOEXCEPT
|
||||
^
|
||||
|
||||
--- Loop.cpp.orig 2018-07-07 17:44:11 UTC
|
||||
+++ Loop.cpp
|
||||
@@ -3969,7 +3969,7 @@ int SetupTcpSocket()
|
||||
tcpAddr.sin_addr.s_addr = htonl(INADDR_ANY);
|
||||
}
|
||||
|
||||
- if (bind(tcpFD, (sockaddr *) &tcpAddr, sizeof(tcpAddr)) == -1)
|
||||
+ if (::bind(tcpFD, (sockaddr *) &tcpAddr, sizeof(tcpAddr)) == -1)
|
||||
{
|
||||
#ifdef PANIC
|
||||
*logofs << "Loop: PANIC! Call to bind failed for TCP port "
|
||||
@@ -4055,7 +4055,7 @@ int SetupUnixSocket()
|
||||
|
||||
*(unixAddr.sun_path + 107) = '\0';
|
||||
|
||||
- if (bind(unixFD, (sockaddr *) &unixAddr, sizeof(unixAddr)) == -1)
|
||||
+ if (::bind(unixFD, (sockaddr *) &unixAddr, sizeof(unixAddr)) == -1)
|
||||
{
|
||||
#ifdef PANIC
|
||||
*logofs << "Loop: PANIC! Call to bind failed for UNIX domain socket "
|
||||
@@ -4567,7 +4567,7 @@ int ListenConnection(int port, const char *label)
|
||||
tcpAddr.sin_addr.s_addr = htonl(INADDR_ANY);
|
||||
}
|
||||
|
||||
- if (bind(newFD, (sockaddr *) &tcpAddr, sizeof(tcpAddr)) == -1)
|
||||
+ if (::bind(newFD, (sockaddr *) &tcpAddr, sizeof(tcpAddr)) == -1)
|
||||
{
|
||||
#ifdef PANIC
|
||||
*logofs << "Loop: PANIC! Call to bind failed for " << label
|
||||
@@ -6748,7 +6748,7 @@ int WaitForRemote(int portNum)
|
||||
|
||||
#endif
|
||||
|
||||
- if (bind(proxyFD, (sockaddr *) &tcpAddr, sizeof(tcpAddr)) == -1)
|
||||
+ if (::bind(proxyFD, (sockaddr *) &tcpAddr, sizeof(tcpAddr)) == -1)
|
||||
{
|
||||
#ifdef PANIC
|
||||
*logofs << "Loop: PANIC! Call to bind failed for TCP port "
|
Loading…
Reference in a new issue