Changeset View
Changeset View
Standalone View
Standalone View
head/net/libproxy/files/patch-libproxy_test_get-pac-test.cpp
| First hunk: | |||||
| libc++ doesn't like "using namespace std" in C++11 | libc++ doesn't like "using namespace std" in C++11 | ||||
| libproxy/test/get-pac-test.cpp:48:10: error: assigning to 'int' from incompatible type '__bind<int &, sockaddr *, unsigned long>' | libproxy/test/get-pac-test.cpp:48:10: error: assigning to 'int' from incompatible type '__bind<int &, sockaddr *, unsigned long>' | ||||
| ret = bind(m_sock, (sockaddr*)&addr, sizeof (struct sockaddr_in)); | ret = bind(m_sock, (sockaddr*)&addr, sizeof (struct sockaddr_in)); | ||||
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||||
| Second hunk: | |||||
| Fix typo. | |||||
| --- libproxy/test/get-pac-test.cpp.orig 2016-01-12 16:41:07 UTC | --- libproxy/test/get-pac-test.cpp.orig 2017-05-11 11:33:33.000000000 +0200 | ||||
| +++ libproxy/test/get-pac-test.cpp | +++ libproxy/test/get-pac-test.cpp 2018-06-02 14:32:22.796000000 +0200 | ||||
| @@ -45,7 +45,7 @@ class TestServer { | @@ -52,7 +52,7 @@ | ||||
| setsockopt(m_sock, SOL_SOCKET, SO_REUSEADDR, &i, sizeof(i)); | setsockopt(m_sock, SOL_SOCKET, SO_REUSEADDR, &i, sizeof(i)); | ||||
| - ret = bind(m_sock, (sockaddr*)&addr, sizeof (struct sockaddr_in)); | - ret = bind(m_sock, (sockaddr*)&addr, sizeof (struct sockaddr_in)); | ||||
| + ret = ::bind(m_sock, (sockaddr*)&addr, sizeof (struct sockaddr_in)); | + ret = ::bind(m_sock, (sockaddr*)&addr, sizeof (struct sockaddr_in)); | ||||
| assert(!ret); | assert(!ret); | ||||
| ret = listen(m_sock, 1); | ret = listen(m_sock, 1); | ||||
| @@ -130,7 +130,7 @@ | |||||
| #ifdef SO_NOSIGPIPE | |||||
| int i = 1; | |||||
| - setsockopt(c_sock, SOL_SOCKET, SO_NOSIGPIPE, &i, sizeof(i)); | |||||
| + setsockopt(csock, SOL_SOCKET, SO_NOSIGPIPE, &i, sizeof(i)); | |||||
| #endif | |||||
| // Read request | |||||