Import of pkgsrc-2015Q1

This commit is contained in:
2015-04-22 14:34:26 +02:00
committed by Lionel Sambuc
parent 9a8c06dafb
commit 4af1cdf7a9
25114 changed files with 870550 additions and 795435 deletions

View File

@@ -0,0 +1,13 @@
$NetBSD: patch-src_diff.h,v 1.1 2014/08/13 22:39:10 joerg Exp $
--- src/diff.h.orig 2014-08-13 20:34:57.000000000 +0000
+++ src/diff.h
@@ -118,7 +118,7 @@ struct Diff3Line
pFineAB=0; pFineBC=0; pFineCA=0;
}
- bool operator==( const Diff3Line& d3l )
+ bool operator==( const Diff3Line& d3l ) const
{
return lineA == d3l.lineA && lineB == d3l.lineB && lineC == d3l.lineC
&& bAEqB == d3l.bAEqB && bAEqC == d3l.bAEqC && bBEqC == d3l.bBEqC;