From 34fc044bbf6c820272e45c8267d83ba40a57a89f Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Thu, 17 Apr 2014 20:51:46 +0200
Subject: [PATCH] Filters need to be C90-compatible for Android build

---
 gfx/filters/2xbr.c       |  2 +-
 gfx/filters/2xsai.c      | 10 ++++++----
 gfx/filters/super2xsai.c | 10 ++++++----
 gfx/filters/supereagle.c | 10 ++++++----
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/gfx/filters/2xbr.c b/gfx/filters/2xbr.c
index 6be73ee2c7..27daecd498 100644
--- a/gfx/filters/2xbr.c
+++ b/gfx/filters/2xbr.c
@@ -121,7 +121,7 @@ uint16_t pg_lbmask;
      {\
           e = (df(PE,PC)+df(PE,PG)+df(PI,H5)+df(PI,F4))+(df(PH,PF)<<2); \
           i = (df(PH,PD)+df(PH,I5)+df(PF,I4)+df(PF,PB))+(df(PE,PI)<<2); \
-          if ((e<i)  && ( !eq(PF,PB) && !eq(PH,PD) || eq(PE,PI) && (!eq(PF,I4) && !eq(PH,I5)) || eq(PE,PG) || eq(PE,PC)) )\
+          if ((e<i)  && ((!eq(PF,PB) && !eq(PH,PD)) || (eq(PE,PI) && (!eq(PF,I4) && !eq(PH,I5))) || eq(PE,PG) || eq(PE,PC)) )\
           {\
               ke=df(PF,PG); ki=df(PH,PC); \
               ex2 = (PE!=PC && PB!=PC); ex3 = (PE!=PG && PD!=PG); px = (df(PE,PF) <= df(PE,PH)) ? PF : PH; \
diff --git a/gfx/filters/2xsai.c b/gfx/filters/2xsai.c
index d137f3091a..8286a2e39e 100644
--- a/gfx/filters/2xsai.c
+++ b/gfx/filters/2xsai.c
@@ -198,14 +198,15 @@ static void twoxsai_generic_xrgb8888(unsigned width, unsigned height,
       int first, int last, uint32_t *src, 
       unsigned src_stride, uint32_t *dst, unsigned dst_stride)
 {
-   const unsigned nextline = (last) ? 0 : src_stride;
+   unsigned nextline, finish;
+   nextline = (last) ? 0 : src_stride;
 
    for (; height; height--)
    {
       uint32_t *in  = (uint32_t*)src;
       uint32_t *out = (uint32_t*)dst;
 
-      for (unsigned finish = width; finish; finish -= 1)
+      for (finish = width; finish; finish -= 1)
       {
          twoxsai_declare_variables(uint32_t, in, nextline);
 
@@ -227,14 +228,15 @@ static void twoxsai_generic_rgb565(unsigned width, unsigned height,
       int first, int last, uint16_t *src, 
       unsigned src_stride, uint16_t *dst, unsigned dst_stride)
 {
-   const unsigned nextline = (last) ? 0 : src_stride;
+   unsigned nextline, finish;
+   nextline = (last) ? 0 : src_stride;
 
    for (; height; height--)
    {
       uint16_t *in  = (uint16_t*)src;
       uint16_t *out = (uint16_t*)dst;
 
-      for (unsigned finish = width; finish; finish -= 1)
+      for (finish = width; finish; finish -= 1)
       {
          twoxsai_declare_variables(uint16_t, in, nextline);
 
diff --git a/gfx/filters/super2xsai.c b/gfx/filters/super2xsai.c
index 4c0375bbd2..0f37f77bec 100644
--- a/gfx/filters/super2xsai.c
+++ b/gfx/filters/super2xsai.c
@@ -172,14 +172,15 @@ static void supertwoxsai_generic_xrgb8888(unsigned width, unsigned height,
       int first, int last, uint32_t *src, 
       unsigned src_stride, uint32_t *dst, unsigned dst_stride)
 {
-   const unsigned nextline = (last) ? 0 : src_stride;
+   unsigned nextline, finish;
+   nextline = (last) ? 0 : src_stride;
 
    for (; height; height--)
    {
       uint32_t *in  = (uint32_t*)src;
       uint32_t *out = (uint32_t*)dst;
 
-      for (unsigned finish = width; finish; finish -= 1)
+      for (finish = width; finish; finish -= 1)
       {
          supertwoxsai_declare_variables(uint32_t, in, nextline);
 
@@ -201,14 +202,15 @@ static void supertwoxsai_generic_rgb565(unsigned width, unsigned height,
       int first, int last, uint16_t *src, 
       unsigned src_stride, uint16_t *dst, unsigned dst_stride)
 {
-   const unsigned nextline = (last) ? 0 : src_stride;
+   unsigned nextline, finish;
+   nextline = (last) ? 0 : src_stride;
 
    for (; height; height--)
    {
       uint16_t *in  = (uint16_t*)src;
       uint16_t *out = (uint16_t*)dst;
 
-      for (unsigned finish = width; finish; finish -= 1)
+      for (finish = width; finish; finish -= 1)
       {
          supertwoxsai_declare_variables(uint16_t, in, nextline);
 
diff --git a/gfx/filters/supereagle.c b/gfx/filters/supereagle.c
index 87081b2c5b..7fb7c08d6b 100644
--- a/gfx/filters/supereagle.c
+++ b/gfx/filters/supereagle.c
@@ -189,14 +189,15 @@ static void supereagle_generic_xrgb8888(unsigned width, unsigned height,
       int first, int last, uint32_t *src, 
       unsigned src_stride, uint32_t *dst, unsigned dst_stride)
 {
-   const unsigned nextline = (last) ? 0 : src_stride;
+   unsigned finish, nextline;
+   nextline = (last) ? 0 : src_stride;
 
    for (; height; height--)
    {
       uint32_t *in  = (uint32_t*)src;
       uint32_t *out = (uint32_t*)dst;
 
-      for (unsigned finish = width; finish; finish -= 1)
+      for (finish = width; finish; finish -= 1)
       {
          supereagle_declare_variables(uint32_t, in, nextline);
 
@@ -212,14 +213,15 @@ static void supereagle_generic_rgb565(unsigned width, unsigned height,
       int first, int last, uint16_t *src, 
       unsigned src_stride, uint16_t *dst, unsigned dst_stride)
 {
-   const unsigned nextline = (last) ? 0 : src_stride;
+   unsigned nextline, finish;
+   nextline = (last) ? 0 : src_stride;
 
    for (; height; height--)
    {
       uint16_t *in  = (uint16_t*)src;
       uint16_t *out = (uint16_t*)dst;
 
-      for (unsigned finish = width; finish; finish -= 1)
+      for (finish = width; finish; finish -= 1)
       {
          supereagle_declare_variables(uint16_t, in, nextline);