Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / libvpx / source / libvpx / vp8 / common / common.h

diff --git a/src/third_party/libvpx/source/libvpx/vp8/common/common.h b/src/third_party/libvpx/source/libvpx/vp8/common/common.h
index 9671da0..17262d6 100644 (file)
--- a/src/third_party/libvpx/source/libvpx/vp8/common/common.h
+++ b/src/third_party/libvpx/source/libvpx/vp8/common/common.h
@@ -18,6 +18,13 @@
 
 #include "vpx_mem/vpx_mem.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define MIN(x, y) (((x) < (y)) ? (x) : (y))
+#define MAX(x, y) (((x) > (y)) ? (x) : (y))
+
 /* Only need this for fixed-size arrays, for structs just assign. */
 
 #define vp8_copy( Dest, Src) { \
@@ -37,4 +44,8 @@
 #define vp8_zero_array( Dest, N)  vpx_memset( Dest, 0, N * sizeof( *Dest));
 
 
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
 #endif  // VP8_COMMON_COMMON_H_