1 files changed, 11 insertions, 3 deletions
diff --git a/chromium/third_party/libvpx/source/libvpx/vp8/encoder/tokenize.h b/chromium/third_party/libvpx/source/libvpx/vp8/encoder/tokenize.h
index 1e6cea11465..b73a9ee1c89 100644
--- a/chromium/third_party/libvpx/source/libvpx/vp8/encoder/tokenize.h
+++ b/chromium/third_party/libvpx/source/libvpx/vp8/encoder/tokenize.h
@@ -9,12 +9,16 @@
  */
 
 
-#ifndef tokenize_h
-#define tokenize_h
+#ifndef VP8_ENCODER_TOKENIZE_H_
+#define VP8_ENCODER_TOKENIZE_H_
 
 #include "vp8/common/entropy.h"
 #include "block.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 void vp8_tokenize_initialize();
 
 typedef struct
@@ -47,4 +51,8 @@ extern const short *const vp8_dct_value_cost_ptr;
  */
 extern const TOKENVALUE *const vp8_dct_value_tokens_ptr;
 
-#endif  /* tokenize_h */
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif  // VP8_ENCODER_TOKENIZE_H_