From 70280b88a6dc45c18cac0b4aa30fcf29ecbd2439 Mon Sep 17 00:00:00 2001
From: Marian Krivos <nezmar@tutok.sk>
Date: Mon, 22 Aug 2011 17:13:32 +0000
Subject: [PATCH] trunk/branch integration: 64bit fix

---
 Foundation/src/NumberFormatter.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Foundation/src/NumberFormatter.cpp b/Foundation/src/NumberFormatter.cpp
index ac8b66c56..8bfddfc48 100644
--- a/Foundation/src/NumberFormatter.cpp
+++ b/Foundation/src/NumberFormatter.cpp
@@ -394,7 +394,11 @@ void NumberFormatter::append(std::string& str, const void* ptr)
 {
 	char buffer[24];
 #if defined(POCO_PTR_IS_64_BIT)
-	std::sprintf(buffer, "%016"I64_FMT"X", (UIntPtr) ptr);
+	#if defined(POCO_LONG_IS_64_BIT)
+		std::sprintf(buffer, "%016lX", (UIntPtr) ptr);
+	#else
+		std::sprintf(buffer, "%016"I64_FMT"X", (UIntPtr) ptr);
+	#endif
 #else
 	std::sprintf(buffer, "%08lX", (UIntPtr) ptr);
 #endif