From: Mark Andrews <marka@isc.org>
Date: Thu, 14 Jul 2016 01:15:46 +0000 (+1000)
Subject: Windows doesn't like LLU use ULL instead
X-Git-Tag: v9.12.0a0~179
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=fef0080f146f6eb739e426008156e6aed58f8380;p=thirdparty%2Fbind9.git

Windows doesn't like LLU use ULL instead
---

diff --git a/bin/named/logconf.c b/bin/named/logconf.c
index 5442e06399b..a96a35b5372 100644
--- a/bin/named/logconf.c
+++ b/bin/named/logconf.c
@@ -143,10 +143,10 @@ channel_fromconf(const cfg_obj_t *channel, isc_logconfig_t *logconfig)
 		 */
 		switch (sizeof(isc_offset_t)) {
 		case 4:
-			maxoffset = 0x7fffffffLLU;
+			maxoffset = 0x7fffffffULL;
 			break;
 		case 8:
-			maxoffset = 0x7fffffffffffffffLLU;
+			maxoffset = 0x7fffffffffffffffULL;
 			break;
 		default:
 			INSIST(0);
diff --git a/lib/isc/tests/print_test.c b/lib/isc/tests/print_test.c
index f8c92f7b35a..d6f3a38cf0e 100644
--- a/lib/isc/tests/print_test.c
+++ b/lib/isc/tests/print_test.c
@@ -46,7 +46,7 @@ ATF_TC_BODY(snprintf, tc) {
 	char buf[10000];
 	isc_uint64_t ll = 8589934592ULL;
 	isc_uint64_t nn = 20000000000000ULL;
-	isc_uint64_t zz = 10000000000000000000LLU;
+	isc_uint64_t zz = 10000000000000000000ULL;
 	int n;
 	size_t size;
 
@@ -110,7 +110,7 @@ ATF_TC_BODY(snprintf, tc) {
 	ATF_CHECK_EQ(n, 4);
 	ATF_CHECK_STREQ(buf, "1750");
 
-	zz = 0xf5f5f5f5f5f5f5f5LLU;
+	zz = 0xf5f5f5f5f5f5f5f5ULL;
 	memset(buf, 0xff, sizeof(buf));
 	n = isc_print_snprintf(buf, sizeof(buf), "0x%"ISC_PRINT_QUADFORMAT"x", zz);
 	ATF_CHECK_EQ(n, 18);