From 897a9a7c1a19afc7227f4597b56cf74127846276 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Wed, 19 Jun 2019 21:20:31 +0200
Subject: [PATCH] (MSVC 2017 UWP) Silence warnings

---
 intl/msg_hash_ja.h                 | 2 +-
 menu/cbs/menu_cbs_right.c          | 8 ++++----
 menu/drivers/ozone/ozone.c         | 4 +---
 menu/drivers/ozone/ozone_entries.c | 4 ++--
 menu/menu_setting.c                | 2 +-
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/intl/msg_hash_ja.h b/intl/msg_hash_ja.h
index 1bf5175379..bc87c50e52 100644
--- a/intl/msg_hash_ja.h
+++ b/intl/msg_hash_ja.h
@@ -1,4 +1,4 @@
-#if defined(_MSC_VER) && !defined(_XBOX) && (_MSC_VER >= 1500 && _MSC_VER < 1900)
+#if defined(_MSC_VER) && !defined(_XBOX) && (_MSC_VER >= 1500)
 #if (_MSC_VER >= 1700)
 /* https://support.microsoft.com/en-us/kb/980263 */
 #pragma execution_character_set("utf-8")
diff --git a/menu/cbs/menu_cbs_right.c b/menu/cbs/menu_cbs_right.c
index 672fd49f19..c3d0131e07 100644
--- a/menu/cbs/menu_cbs_right.c
+++ b/menu/cbs/menu_cbs_right.c
@@ -417,9 +417,9 @@ static int action_right_video_gpu_index(unsigned type, const char *label,
 
          if (list)
          {
-            if (settings->ints.d3d11_gpu_index < list->size - 1)
+            if (settings->ints.d3d11_gpu_index < (int)(list->size - 1))
                settings->ints.d3d11_gpu_index++;
-            else if (settings->ints.d3d11_gpu_index == list->size - 1)
+            else if (settings->ints.d3d11_gpu_index == (int)(list->size - 1))
                settings->ints.d3d11_gpu_index = 0;
          }
 
@@ -433,9 +433,9 @@ static int action_right_video_gpu_index(unsigned type, const char *label,
 
          if (list)
          {
-            if (settings->ints.d3d12_gpu_index < list->size - 1)
+            if (settings->ints.d3d12_gpu_index < (int)(list->size - 1))
                settings->ints.d3d12_gpu_index++;
-            else if (settings->ints.d3d12_gpu_index == list->size - 1)
+            else if (settings->ints.d3d12_gpu_index == (int)(list->size - 1))
                settings->ints.d3d12_gpu_index = 0;
          }
 
diff --git a/menu/drivers/ozone/ozone.c b/menu/drivers/ozone/ozone.c
index 0b2b9cdfd1..8cbf6018f1 100644
--- a/menu/drivers/ozone/ozone.c
+++ b/menu/drivers/ozone/ozone.c
@@ -1811,9 +1811,7 @@ static int ozone_menu_iterate(menu_handle_t *menu, void *userdata, enum menu_act
    unsigned horizontal_list_size = 0;
 
    if (!ozone)
-   {
       return generic_menu_iterate(menu, userdata, action);
-   }
 
    if (ozone->horizontal_list)
       horizontal_list_size = ozone->horizontal_list->size;
@@ -1835,7 +1833,7 @@ static int ozone_menu_iterate(menu_handle_t *menu, void *userdata, enum menu_act
          tag           = (uintptr_t)ozone;
          new_selection = (ozone->categories_selection_ptr + 1);
 
-         if (new_selection >= ozone->system_tab_end + horizontal_list_size + 1)
+         if (new_selection >= (int)(ozone->system_tab_end + horizontal_list_size + 1))
             new_selection = 0;
 
          ozone_sidebar_goto(ozone, new_selection);
diff --git a/menu/drivers/ozone/ozone_entries.c b/menu/drivers/ozone/ozone_entries.c
index ad6832e508..1d8cc2a4cc 100644
--- a/menu/drivers/ozone/ozone_entries.c
+++ b/menu/drivers/ozone/ozone_entries.c
@@ -438,8 +438,8 @@ void ozone_draw_entries(ozone_handle_t *ozone, video_frame_info_t *video_info,
       /* Cursor */
       if (!old_list && ozone->cursor_mode)
       {
-         if (  cursor_x >= border_start_x && cursor_x <= border_start_x + entry_width &&
-               cursor_y >= border_start_y && cursor_y <= border_start_y + button_height)
+         if (  cursor_x >= border_start_x && (cursor_x <= border_start_x + (int)entry_width) &&
+               cursor_y >= border_start_y && (cursor_y <= border_start_y + (int)button_height))
          {
             selection_y = y;
             menu_navigation_set_selection(i);
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 23dcae8b3f..c408ba3ff6 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -787,7 +787,7 @@ static void setting_get_string_representation_int_gpu_index(rarch_setting_t *set
    {
       struct string_list *list = video_driver_get_gpu_api_devices(video_context_driver_get_api());
 
-      if (list && *setting->value.target.integer < list->size && !string_is_empty(list->elems[*setting->value.target.integer].data))
+      if (list && (*setting->value.target.integer < (int)list->size) && !string_is_empty(list->elems[*setting->value.target.integer].data))
          snprintf(s, len, "%d - %s", *setting->value.target.integer, list->elems[*setting->value.target.integer].data);
       else
          snprintf(s, len, "%d", *setting->value.target.integer);