From 7508eab65562a1988083b425c0f8692f6e3400d9 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 20 Mar 2016 17:01:15 +0100
Subject: [PATCH] (CXX_BUILD) Avoid some C++ warnings + buildfix

---
 cores/libretro-ffmpeg/ffmpeg_core.c | 4 ++--
 menu/cbs/menu_cbs_ok.c              | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/cores/libretro-ffmpeg/ffmpeg_core.c b/cores/libretro-ffmpeg/ffmpeg_core.c
index e42281cce1..8475767390 100644
--- a/cores/libretro-ffmpeg/ffmpeg_core.c
+++ b/cores/libretro-ffmpeg/ffmpeg_core.c
@@ -900,7 +900,7 @@ static bool init_media_info(void)
 #ifdef HAVE_SSA
    if (sctx[0])
    {
-      size_t i;
+      unsigned i;
 
       ass = ass_library_init();
       ass_set_message_cb(ass, ass_msg_cb, NULL);
@@ -915,7 +915,7 @@ static bool init_media_info(void)
       ass_set_fonts(ass_render, NULL, NULL, 1, NULL, 1);
       ass_set_hinting(ass_render, ASS_HINTING_LIGHT);
 
-      for (i = 0; i < subtitle_streams_num; i++)
+      for (i = 0; i < (unsigned)subtitle_streams_num; i++)
       {
          ass_track[i] = ass_new_track(ass);
          ass_process_codec_private(ass_track[i], (char*)ass_extra_data[i],
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index b2329da8e6..54a0f2d816 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -17,6 +17,7 @@
 #include <retro_assert.h>
 #include <retro_stat.h>
 #include <string/stdstring.h>
+#include <streams/file_stream.h>
 #include <lists/string_list.h>
 
 #include "../menu_driver.h"