Line 0
Link Here
|
|
|
1 |
--- ext/em.cpp.orig 2018-01-18 19:46:12 UTC |
2 |
+++ ext/em.cpp |
3 |
@@ -375,7 +375,7 @@ void EventMachine_t::_InitializeLoopBrea |
4 |
for (i=0; i < 100; i++) { |
5 |
int r = (rand() % 10000) + 20000; |
6 |
LoopBreakerTarget.sin_port = htons (r); |
7 |
- if (bind (sd, (struct sockaddr*)&LoopBreakerTarget, sizeof(LoopBreakerTarget)) == 0) |
8 |
+ if (::bind (sd, (struct sockaddr*)&LoopBreakerTarget, sizeof(LoopBreakerTarget)) == 0) |
9 |
break; |
10 |
} |
11 |
|
12 |
@@ -1239,7 +1239,7 @@ const uintptr_t EventMachine_t::ConnectT |
13 |
snprintf (buf, sizeof(buf)-1, "invalid bind address: %s", gai_strerror(gai)); |
14 |
throw std::runtime_error (buf); |
15 |
} |
16 |
- if (bind (sd, (struct sockaddr *)&bind_to, bind_to_len) < 0) { |
17 |
+ if (::bind (sd, (struct sockaddr *)&bind_to, bind_to_len) < 0) { |
18 |
close (sd); |
19 |
throw std::runtime_error ("couldn't bind to address"); |
20 |
} |
21 |
@@ -1620,7 +1620,7 @@ const uintptr_t EventMachine_t::CreateTc |
22 |
} |
23 |
|
24 |
|
25 |
- if (bind (sd_accept, (struct sockaddr *)&bind_here, bind_here_len)) { |
26 |
+ if (::bind (sd_accept, (struct sockaddr *)&bind_here, bind_here_len)) { |
27 |
//__warning ("binding failed"); |
28 |
goto fail; |
29 |
} |
30 |
@@ -1667,7 +1667,7 @@ const uintptr_t EventMachine_t::OpenData |
31 |
if (!SetSocketNonblocking (sd)) |
32 |
goto fail; |
33 |
|
34 |
- if (bind (sd, (struct sockaddr *)&bind_here, bind_here_len) != 0) |
35 |
+ if (::bind (sd, (struct sockaddr *)&bind_here, bind_here_len) != 0) |
36 |
goto fail; |
37 |
|
38 |
{ // Looking good. |
39 |
@@ -1953,7 +1953,7 @@ const uintptr_t EventMachine_t::CreateUn |
40 |
#endif |
41 |
} |
42 |
|
43 |
- if (bind (sd_accept, (struct sockaddr*)&s_sun, sizeof(s_sun))) { |
44 |
+ if (::bind (sd_accept, (struct sockaddr*)&s_sun, sizeof(s_sun))) { |
45 |
//__warning ("binding failed"); |
46 |
goto fail; |
47 |
} |