Index: branches/2018Q1/net/xprobe/files/patch-src-xplib-xp_lib.cc
===================================================================
--- branches/2018Q1/net/xprobe/files/patch-src-xplib-xp_lib.cc	(nonexistent)
+++ branches/2018Q1/net/xprobe/files/patch-src-xplib-xp_lib.cc	(revision 461508)
@@ -0,0 +1,11 @@
+--- src/xplib/xp_lib.cc.orig	2005-07-27 08:38:16 UTC
++++ src/xplib/xp_lib.cc
+@@ -82,7 +82,7 @@ int xp_lib::OpenUDPSocket(struct sockadd
+ 		return FAIL;
+ 	}
+ 	if (bind_sin != NULL)
+-		if (bind(sock, (struct sockaddr *)bind_sin, sizeof(struct sockaddr_in)) == -1) {
++		if (::bind(sock, (struct sockaddr *)bind_sin, sizeof(struct sockaddr_in)) == -1) {
+ 			return FAIL;
+ 		}
+ 

Property changes on: branches/2018Q1/net/xprobe/files/patch-src-xplib-xp_lib.cc
___________________________________________________________________
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
Index: branches/2018Q1
===================================================================
--- branches/2018Q1	(revision 461507)
+++ branches/2018Q1	(revision 461508)

Property changes on: branches/2018Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r461501