From 5c25cc90765cbf6ad7f01c0b635c72595bc7f457 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Thu, 21 Jun 2018 08:18:07 +0200
Subject: [PATCH] Squashed 'libretro-common/' changes from
 3d989dc968..c9b117d5b8

c9b117d5b8 Silence more warnings

git-subtree-dir: libretro-common
git-subtree-split: c9b117d5b8135acd6c175e93931f39067e7d0ec4
---
 formats/bmp/rbmp.c | 13 ++++++++++---
 formats/tga/rtga.c | 10 ++++++++--
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/formats/bmp/rbmp.c b/formats/bmp/rbmp.c
index 96ea616509..7fc64c8e29 100644
--- a/formats/bmp/rbmp.c
+++ b/formats/bmp/rbmp.c
@@ -159,7 +159,10 @@ static unsigned char *rbmp__convert_format(
             break;
          case ((3)*8+(2)):
             for(i=x-1; i >= 0; --i, src += 3, dest += 2)
-               dest[0] = RBMP_COMPUTE_Y(src[0],src[1],src[2]), dest[1] = 255;
+            {
+               dest[0] = RBMP_COMPUTE_Y(src[0],src[1],src[2]);
+               dest[1] = 255;
+            }
             break;
          case ((4)*8+(1)):
             for(i=x-1; i >= 0; --i, src += 4, dest += 1)
@@ -167,7 +170,10 @@ static unsigned char *rbmp__convert_format(
             break;
          case ((4)*8+(2)):
             for(i=x-1; i >= 0; --i, src += 4, dest += 2)
-               dest[0] = RBMP_COMPUTE_Y(src[0],src[1],src[2]), dest[1] = src[3];
+            {
+               dest[0] = RBMP_COMPUTE_Y(src[0],src[1],src[2]);
+               dest[1] = src[3];
+            }
             break;
          case ((4)*8+(3)):
             for(i=x-1; i >= 0; --i, src += 4, dest += 3)
@@ -438,7 +444,8 @@ static unsigned char *rbmp__bmp_load(rbmp__context *s, unsigned *x, unsigned *y,
       {
          for (i=0; i < (int) s->img_x; i += 2)
          {
-            int v=rbmp__get8(s),v2=0;
+            int v=rbmp__get8(s);
+            int v2=0;
             if (bpp == 4)
             {
                v2 = v & 15;
diff --git a/formats/tga/rtga.c b/formats/tga/rtga.c
index f66b2926e0..406a68aa1e 100644
--- a/formats/tga/rtga.c
+++ b/formats/tga/rtga.c
@@ -157,7 +157,10 @@ static unsigned char *rtga__convert_format(
             break;
          case ((3)*8+(2)):
             for(i=x-1; i >= 0; --i, src += 3, dest += 2)
-               dest[0] = RTGA_COMPUTE_Y(src[0],src[1],src[2]), dest[1] = 255;
+            {
+               dest[0] = RTGA_COMPUTE_Y(src[0],src[1],src[2]);
+               dest[1] = 255;
+            }
             break;
          case ((4)*8+(1)):
             for(i=x-1; i >= 0; --i, src += 4, dest += 1)
@@ -165,7 +168,10 @@ static unsigned char *rtga__convert_format(
             break;
          case ((4)*8+(2)):
             for(i=x-1; i >= 0; --i, src += 4, dest += 2)
-               dest[0] = RTGA_COMPUTE_Y(src[0],src[1],src[2]), dest[1] = src[3];
+            {
+               dest[0] = RTGA_COMPUTE_Y(src[0],src[1],src[2]);
+               dest[1] = src[3];
+            }
             break;
          case ((4)*8+(3)):
             for(i=x-1; i >= 0; --i, src += 4, dest += 3)