projects
/
profile
/
ivi
/
libvpx.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
99d02c0
)
Disable compile warning for ERROR macro
author
John Koleszar
<jkoleszar@google.com>
Wed, 17 Nov 2010 14:08:47 +0000
(09:08 -0500)
committer
John 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
patch
|
blob
|
history
diff --git
a/vp8/vp8_cx_iface.c
b/vp8/vp8_cx_iface.c
index
6a28720
..
a77a9b2
100644
(file)
--- 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;\