Import of pkgsrc-2015Q2

This commit is contained in:
2015-08-30 02:56:09 -07:00
committed by Lionel Sambuc
parent 4af1cdf7a9
commit f641581404
15409 changed files with 267784 additions and 121624 deletions

View File

@@ -1,9 +1,9 @@
$NetBSD: patch-src_charstring.cpp,v 1.2 2014/03/31 14:42:20 fhajny Exp $
$NetBSD: patch-src_charstring.cpp,v 1.3 2015/05/19 14:12:40 ryoon Exp $
Remove ambiguity (fixes build with GCC>=4.7).
--- src/charstring.cpp.orig 2014-03-07 05:54:23.000000000 +0000
--- src/charstring.cpp.orig 2015-04-12 01:27:08.000000000 +0000
+++ src/charstring.cpp
@@ -349,7 +349,7 @@ char *charstring::convertAmount(int64_t
@@ -356,7 +356,7 @@ char *charstring::convertAmount(int64_t
}
negative[1]='\0';
char *amountstr=new char[length];
@@ -11,4 +11,4 @@ Remove ambiguity (fixes build with GCC>=4.7).
+ int64_t amt=abs((int)amount);
printf(amountstr,length,
"$%s%lld.%02lld",negative,
(long long)(amt/100),
amt/100,amt-(amt/100*100));