From 2ad71548b87b1b039b1dc5f358f90a372ded233f Mon Sep 17 00:00:00 2001
From: Jason Felds <jafelds@gmail.com>
Date: Wed, 26 Dec 2012 22:44:08 -0500
Subject: [PATCH] war on -Werror, part 5: win macro redefinition.

Replaces commit 70b8f34.
---
 src/archutils/Win32/arch_setup.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/archutils/Win32/arch_setup.h b/src/archutils/Win32/arch_setup.h
index 2872d71972..30a179f72d 100644
--- a/src/archutils/Win32/arch_setup.h
+++ b/src/archutils/Win32/arch_setup.h
@@ -108,7 +108,9 @@ typedef __int64 int64_t;
 typedef unsigned __int64 uint64_t;
 #if _MSC_VER < 1700	// 1700 = VC++ 2011
 #define INT64_C(i) i##i64
-#define UINT64_C(i) i##i64
+#ifndef UINT64_C
+#define UINT64_C(i) i##ui64
+#endif
 #endif // #if _MSC_VER < 1700
 #if _MSC_VER < 1600	// 1600 = VC++ 2010
 static inline int64_t llabs( int64_t i ) { return i >= 0? i: -i; }