head	1.3;
access;
symbols
	pkgsrc-2013Q2:1.3.0.8
	pkgsrc-2013Q2-base:1.3
	pkgsrc-2012Q4:1.3.0.6
	pkgsrc-2012Q4-base:1.3
	pkgsrc-2011Q4:1.3.0.4
	pkgsrc-2011Q4-base:1.3
	pkgsrc-2011Q2:1.3.0.2
	pkgsrc-2011Q2-base:1.3
	pkgsrc-2010Q4:1.2.0.34
	pkgsrc-2010Q4-base:1.2
	pkgsrc-2010Q3:1.2.0.32
	pkgsrc-2010Q3-base:1.2
	pkgsrc-2010Q2:1.2.0.30
	pkgsrc-2010Q2-base:1.2
	pkgsrc-2010Q1:1.2.0.28
	pkgsrc-2010Q1-base:1.2
	pkgsrc-2009Q4:1.2.0.26
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2009Q3:1.2.0.24
	pkgsrc-2009Q3-base:1.2
	pkgsrc-2009Q2:1.2.0.22
	pkgsrc-2009Q2-base:1.2
	pkgsrc-2009Q1:1.2.0.20
	pkgsrc-2009Q1-base:1.2
	pkgsrc-2008Q4:1.2.0.18
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.2.0.16
	pkgsrc-2008Q3-base:1.2
	cube-native-xorg:1.2.0.14
	cube-native-xorg-base:1.2
	pkgsrc-2008Q2:1.2.0.12
	pkgsrc-2008Q2-base:1.2
	cwrapper:1.2.0.10
	pkgsrc-2008Q1:1.2.0.8
	pkgsrc-2008Q1-base:1.2
	pkgsrc-2007Q4:1.2.0.6
	pkgsrc-2007Q4-base:1.2
	pkgsrc-2007Q3:1.2.0.4
	pkgsrc-2007Q3-base:1.2
	pkgsrc-2007Q2:1.2.0.2
	pkgsrc-2007Q2-base:1.2
	pkgsrc-2007Q1:1.1.0.18
	pkgsrc-2007Q1-base:1.1
	pkgsrc-2006Q4:1.1.0.16
	pkgsrc-2006Q4-base:1.1
	pkgsrc-2006Q3:1.1.0.14
	pkgsrc-2006Q3-base:1.1
	pkgsrc-2006Q2:1.1.0.12
	pkgsrc-2006Q2-base:1.1
	pkgsrc-2006Q1:1.1.0.10
	pkgsrc-2006Q1-base:1.1
	pkgsrc-2005Q4:1.1.0.8
	pkgsrc-2005Q4-base:1.1
	pkgsrc-2005Q3:1.1.0.6
	pkgsrc-2005Q3-base:1.1
	pkgsrc-2005Q2:1.1.0.4
	pkgsrc-2005Q2-base:1.1
	pkgsrc-2005Q1:1.1.0.2
	pkgsrc-2005Q1-base:1.1;
locks; strict;
comment	@# @;


1.3
date	2011.03.19.19.59.46;	author spz;	state dead;
branches;
next	1.2;

1.2
date	2007.05.22.12.17.49;	author spz;	state Exp;
branches;
next	1.1;

1.1
date	2005.03.06.11.40.21;	author spz;	state Exp;
branches;
next	;


desc
@@


1.3
log
@remove obsolete irrtoolset-nox11
@
text
@$NetBSD: patch-bj,v 1.2 2007/05/22 12:17:49 spz Exp $

--- ./src/Core/util/Buffer.cc.orig	2006-10-09 18:05:14.000000000 +0200
+++ ./src/Core/util/Buffer.cc
@@@@ -36,7 +36,11 @@@@
 #include <cassert>
 #include <iomanip>
 #include <cctype>
+#if (__GNUC__ > 2)
 #include <ostream>
+#else
+#include <ostream.h>
+#endif
 
 using namespace std;
 
@@@@ -174,7 +178,10 @@@@ Buffer::uncompress()
 
 void Buffer::extend(unsigned long minExtend) {
    assert(!callerAllocated);	// !!!
-   capacity = (capacity + BufferExtendIncrement) >? (size + minExtend);
+   // using deprecated g++ only operators is not that portable,
+   // use ordinary trigraph instead
+   capacity = ( (capacity + BufferExtendIncrement) > (size + minExtend) ) ?
+			   (capacity + BufferExtendIncrement) : (size + minExtend);
    contents = (char *)realloc(contents, capacity);
 }
 
@


1.2
log
@new version, new patches: upstream adopted a bunch of ours, but gcc found
new things to bitch about
@
text
@d1 1
a1 1
$NetBSD$
@


1.1
log
@make compilation with gcc 2.95.* work (mostly by rolling back includes
changes from IRRToolSet 4.8.1 within #if (__GNUC__ > 2) .. #else)
also incidentially fixes a bug in rusage.cc
@
text
@d3 2
a4 2
--- src/Core/util/Buffer.cc.orig	2004-07-30 12:58:10.000000000 +0200
+++ src/Core/util/Buffer.cc
d17 12
@