Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 1 | From 2d73469c7a17ebfe4330ac6643b0c8abdc125d05 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Wed, 30 Jan 2019 09:29:44 -0800 |
| 4 | Subject: [PATCH] get-pac-test: Fix build with clang/libc++ |
| 5 | |
| 6 | get-pac-test.cpp:55:10: error: assigning to 'int' from incompatible type '__bind<int &, sockaddr *, unsigned int>' |
| 7 | ret = bind(m_sock, (sockaddr*)&addr, sizeof (struct sockaddr_in)); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
| 8 | |
| 9 | Upstream-Status: Submitted [https://github.com/libproxy/libproxy/pull/97] |
| 10 | |
| 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 12 | --- |
| 13 | libproxy/test/get-pac-test.cpp | 2 +- |
| 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 15 | |
| 16 | diff --git a/libproxy/test/get-pac-test.cpp b/libproxy/test/get-pac-test.cpp |
| 17 | index 0059dfb..911f296 100644 |
| 18 | --- a/libproxy/test/get-pac-test.cpp |
| 19 | +++ b/libproxy/test/get-pac-test.cpp |
| 20 | @@ -52,7 +52,7 @@ class TestServer { |
| 21 | |
| 22 | setsockopt(m_sock, SOL_SOCKET, SO_REUSEADDR, &i, sizeof(i)); |
| 23 | |
| 24 | - ret = bind(m_sock, (sockaddr*)&addr, sizeof (struct sockaddr_in)); |
| 25 | + ret = ::bind(m_sock, (sockaddr*)&addr, sizeof (struct sockaddr_in)); |
| 26 | assert(!ret); |
| 27 | |
| 28 | ret = listen(m_sock, 1); |
| 29 | -- |
| 30 | 2.20.1 |
| 31 | |