From f8ff3e5d4783b6e30950927d6490986313a55d5f Mon Sep 17 00:00:00 2001
From: Yaowu Xu <yaowu@google.com>
Date: Thu, 13 Dec 2012 16:09:52 -0800
Subject: [PATCH] prevents redefine of INT64_MAX

MSVC 2012 (_MSC_VER=1600) introduced the definition, this commit
prevents the redefinition of the macro

Change-Id: I7de92e7e9e865a342f2bcc4b071f8d3c9b2a508c
---
 vp9/common/vp9_type_aliases.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/vp9/common/vp9_type_aliases.h b/vp9/common/vp9_type_aliases.h
index 110e2d0..47be747 100644
--- a/vp9/common/vp9_type_aliases.h
+++ b/vp9/common/vp9_type_aliases.h
@@ -97,9 +97,11 @@ typedef unsigned char   BOOLEAN;
 
 #ifdef _MSC_VER
 typedef __int64 INT64;
+#if _MSC_VER < 1600
 #ifndef INT64_MAX
 #define INT64_MAX LLONG_MAX
 #endif
+#endif
 #else
 
 #ifndef TYPE_INT64
-- 
2.7.4