From c645d435988bff55ea5b898c4bad0a2b4fd58ae0 Mon Sep 17 00:00:00 2001
From: jdgleaver <james@leaver.myzen.co.uk>
Date: Tue, 10 Sep 2019 16:49:07 +0100
Subject: [PATCH] 'CXX_BUILD=1' build fix

---
 menu/menu_displaylist.c | 2 +-
 runtime_file.c          | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 24088d28d0..79ddeb8921 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -3124,7 +3124,7 @@ static unsigned menu_displaylist_parse_content_information(
             /* Last Played */
             tmp[0] = '\0';
             runtime_log_get_last_played_str(runtime_log, tmp, sizeof(tmp),
-                  settings->uints.playlist_sublabel_last_played_style);
+                  (enum playlist_sublabel_last_played_style_type)settings->uints.playlist_sublabel_last_played_style);
 
             if (!string_is_empty(tmp))
                if (menu_entries_append_enum(info->list, tmp,
diff --git a/runtime_file.c b/runtime_file.c
index cb80dfce0e..111e22a8f9 100644
--- a/runtime_file.c
+++ b/runtime_file.c
@@ -31,6 +31,7 @@
 #include <streams/file_stream.h>
 #include <formats/jsonsax_full.h>
 #include <string/stdstring.h>
+#include <encodings/utf.h>
 
 #include "file_path_special.h"
 #include "paths.h"
@@ -969,7 +970,7 @@ void runtime_update_playlist(playlist_t *playlist, size_t idx)
    /* Get current last played formatting type
     * > Have to include a 'HAVE_MENU' check here... */
 #ifdef HAVE_MENU
-   timedate_style = settings->uints.playlist_sublabel_last_played_style;
+   timedate_style = (enum playlist_sublabel_last_played_style_type)settings->uints.playlist_sublabel_last_played_style;
 #else
    timedate_style = PLAYLIST_LAST_PLAYED_STYLE_YMD_HMS
 #endif