Disable compile warning for ERROR macro
authorJohn Koleszar <jkoleszar@google.com>
Wed, 17 Nov 2010 14:08:47 +0000 (09:08 -0500)
committerJohn Koleszar <jkoleszar@google.com>
Wed, 17 Nov 2010 14:08:51 +0000 (09:08 -0500)
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

index 6a28720..a77a9b2 100644 (file)
@@ -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;\