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

@@ -1,14 +1,14 @@
$NetBSD: patch-src_charstring.cpp,v 1.1 2013/09/14 09:14:08 fhajny Exp $
$NetBSD: patch-src_charstring.cpp,v 1.2 2014/03/31 14:42:20 fhajny Exp $
Remove ambiguity (fixes build with GCC>=4.7).
--- src/charstring.cpp.orig 2013-08-01 02:43:39.000000000 +0000
--- src/charstring.cpp.orig 2014-03-07 05:54:23.000000000 +0000
+++ src/charstring.cpp
@@ -309,7 +309,7 @@ char *charstring::convertAmount(int64_t
@@ -349,7 +349,7 @@ char *charstring::convertAmount(int64_t
}
negative[1]='\0';
char *amountstr=new char[length];
- int64_t amt=abs(amount);
+ int64_t amt=abs((int)amount);
sprintf(amountstr,"$%s%lld.%02lld",negative,
(long long)(amt/100),
(long long)(amt-(amt/100*100)));
printf(amountstr,length,
"$%s%lld.%02lld",negative,
(long long)(amt/100),