head	1.1;
access;
symbols
	pkgsrc-2026Q1:1.1.0.52
	pkgsrc-2026Q1-base:1.1
	pkgsrc-2025Q4:1.1.0.50
	pkgsrc-2025Q4-base:1.1
	pkgsrc-2025Q3:1.1.0.48
	pkgsrc-2025Q3-base:1.1
	pkgsrc-2025Q2:1.1.0.46
	pkgsrc-2025Q2-base:1.1
	pkgsrc-2025Q1:1.1.0.44
	pkgsrc-2025Q1-base:1.1
	pkgsrc-2024Q4:1.1.0.42
	pkgsrc-2024Q4-base:1.1
	pkgsrc-2024Q3:1.1.0.40
	pkgsrc-2024Q3-base:1.1
	pkgsrc-2024Q2:1.1.0.38
	pkgsrc-2024Q2-base:1.1
	pkgsrc-2024Q1:1.1.0.36
	pkgsrc-2024Q1-base:1.1
	pkgsrc-2023Q4:1.1.0.34
	pkgsrc-2023Q4-base:1.1
	pkgsrc-2023Q3:1.1.0.32
	pkgsrc-2023Q3-base:1.1
	pkgsrc-2023Q2:1.1.0.30
	pkgsrc-2023Q2-base:1.1
	pkgsrc-2023Q1:1.1.0.28
	pkgsrc-2023Q1-base:1.1
	pkgsrc-2022Q4:1.1.0.26
	pkgsrc-2022Q4-base:1.1
	pkgsrc-2022Q3:1.1.0.24
	pkgsrc-2022Q3-base:1.1
	pkgsrc-2022Q2:1.1.0.22
	pkgsrc-2022Q2-base:1.1
	pkgsrc-2022Q1:1.1.0.20
	pkgsrc-2022Q1-base:1.1
	pkgsrc-2021Q4:1.1.0.18
	pkgsrc-2021Q4-base:1.1
	pkgsrc-2021Q3:1.1.0.16
	pkgsrc-2021Q3-base:1.1
	pkgsrc-2021Q2:1.1.0.14
	pkgsrc-2021Q2-base:1.1
	pkgsrc-2021Q1:1.1.0.12
	pkgsrc-2021Q1-base:1.1
	pkgsrc-2020Q4:1.1.0.10
	pkgsrc-2020Q4-base:1.1
	pkgsrc-2020Q3:1.1.0.8
	pkgsrc-2020Q3-base:1.1
	pkgsrc-2020Q2:1.1.0.6
	pkgsrc-2020Q2-base:1.1
	pkgsrc-2020Q1:1.1.0.2
	pkgsrc-2020Q1-base:1.1
	pkgsrc-2019Q4:1.1.0.4
	pkgsrc-2019Q4-base:1.1;
locks; strict;
comment	@// @;


1.1
date	2019.12.18.12.43.40;	author joerg;	state Exp;
branches;
next	;
commitid	c2W1Ar1QtDcvFbPB;


desc
@@


1.1
log
@Resolve conflict with STL.
@
text
@$NetBSD$

The socket function, not the generic function call STL method.

--- test/cpp/server_abyss.cpp.orig	2019-12-17 01:07:01.776470052 +0000
+++ test/cpp/server_abyss.cpp
@@@@ -85,7 +85,7 @@@@ public:
         sockAddr.sin_port   = htons(portNumber);
         sockAddr.sin_addr.s_addr = 0;
 
-        rc = bind(this->fd, (struct sockaddr *)&sockAddr, sizeof(sockAddr));
+        rc = ::bind(this->fd, (struct sockaddr *)&sockAddr, sizeof(sockAddr));
         
         if (rc != 0) {
             closesock(this->fd);
@