From 79e2b1f39b9bb79a64543935e3616bf8abf7dcd8 Mon Sep 17 00:00:00 2001
From: John Koleszar <jkoleszar@google.com>
Date: Wed, 17 Nov 2010 09:08:47 -0500
Subject: [PATCH] Disable compile warning for ERROR macro

The ERROR macro collides wiith the MS SDK on Windows. Since we're not
making any win32 calls in this function, just #undef it first to take
ownership.

Change-Id: Ic18c60dfa3a33c52e6c49d3f4f8d3e7e3ac3341d
---
 vp8/vp8_cx_iface.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vp8/vp8_cx_iface.c b/vp8/vp8_cx_iface.c
index 6a28720..a77a9b2 100644
--- a/vp8/vp8_cx_iface.c
+++ b/vp8/vp8_cx_iface.c
@@ -104,6 +104,7 @@ update_error_state(vpx_codec_alg_priv_t                 *ctx,
 }
 
 
+#undef ERROR
 #define ERROR(str) do {\
         ctx->base.err_detail = str;\
         return VPX_CODEC_INVALID_PARAM;\
-- 
2.7.4