Attachment 189891 Details for Bug 225304 – Proposed patch

[patch] Proposed patch

rem.diff (text/plain), 2.29 KB, created by Antoine Brodin on 2018-01-18 20:01:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Antoine Brodin

Created: 2018-01-18 20:01:28 UTC

Size: 2.29 KB

patch

obsolete

>Index: devel/rubygem-eventmachine/files/patch-ext_em.cpp
>===================================================================
>--- devel/rubygem-eventmachine/files/patch-ext_em.cpp	(nonexistent)
>+++ devel/rubygem-eventmachine/files/patch-ext_em.cpp	(working copy)
>@@ -0,0 +1,47 @@
>+--- ext/em.cpp.orig	2018-01-18 19:46:12 UTC
>++++ ext/em.cpp
>+@@ -375,7 +375,7 @@ void EventMachine_t::_InitializeLoopBrea
>+ 	for (i=0; i < 100; i++) {
>+ 		int r = (rand() % 10000) + 20000;
>+ 		LoopBreakerTarget.sin_port = htons (r);
>+-		if (bind (sd, (struct sockaddr*)&LoopBreakerTarget, sizeof(LoopBreakerTarget)) == 0)
>++		if (::bind (sd, (struct sockaddr*)&LoopBreakerTarget, sizeof(LoopBreakerTarget)) == 0)
>+ 			break;
>+ 	}
>+ 
>+@@ -1239,7 +1239,7 @@ const uintptr_t EventMachine_t::ConnectT
>+ 			snprintf (buf, sizeof(buf)-1, "invalid bind address: %s", gai_strerror(gai));
>+ 			throw std::runtime_error (buf);
>+ 		}
>+-		if (bind (sd, (struct sockaddr *)&bind_to, bind_to_len) < 0) {
>++		if (::bind (sd, (struct sockaddr *)&bind_to, bind_to_len) < 0) {
>+ 			close (sd);
>+ 			throw std::runtime_error ("couldn't bind to address");
>+ 		}
>+@@ -1620,7 +1620,7 @@ const uintptr_t EventMachine_t::CreateTc
>+ 	}
>+ 
>+ 
>+-	if (bind (sd_accept, (struct sockaddr *)&bind_here, bind_here_len)) {
>++	if (::bind (sd_accept, (struct sockaddr *)&bind_here, bind_here_len)) {
>+ 		//__warning ("binding failed");
>+ 		goto fail;
>+ 	}
>+@@ -1667,7 +1667,7 @@ const uintptr_t EventMachine_t::OpenData
>+ 	if (!SetSocketNonblocking (sd))
>+ 		goto fail;
>+ 
>+-	if (bind (sd, (struct sockaddr *)&bind_here, bind_here_len) != 0)
>++	if (::bind (sd, (struct sockaddr *)&bind_here, bind_here_len) != 0)
>+ 		goto fail;
>+ 
>+ 	{ // Looking good.
>+@@ -1953,7 +1953,7 @@ const uintptr_t EventMachine_t::CreateUn
>+ 		#endif
>+ 	}
>+ 
>+-	if (bind (sd_accept, (struct sockaddr*)&s_sun, sizeof(s_sun))) {
>++	if (::bind (sd_accept, (struct sockaddr*)&s_sun, sizeof(s_sun))) {
>+ 		//__warning ("binding failed");
>+ 		goto fail;
>+ 	}
>
>Property changes on: devel/rubygem-eventmachine/files/patch-ext_em.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 225304: 189891