From 031f87ad2c2a2784a287fc800354802fe9761b85 Mon Sep 17 00:00:00 2001
From: Thomas Bernard <miniupnp@free.fr>
Date: Tue, 8 Aug 2017 18:04:39 +0200
Subject: [PATCH] remove "warning: ISO C90 forbids mixed declarations and code"

---
 src/setup.c |  8 +++++---
 src/text.c  | 11 +++++------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/setup.c b/src/setup.c
index a9afabaa..221d36df 100644
--- a/src/setup.c
+++ b/src/setup.c
@@ -71,13 +71,12 @@ int Create_ConfigDirectory(char * config_dir)
 // OUT: Write into program_dir. Trailing / or \ is kept.
 // Note : in fact this is only used to check for the datafiles and fonts in 
 // this same directory.
-void Set_program_directory(const char * argv0,char * program_dir)
+void Set_program_directory(const char * argv0, char * program_dir)
 {
-  (void)argv0; // unused sometimes
-  
   // MacOSX
   #if defined(__macosx__)
     CFURLRef url = CFBundleCopyBundleURL(CFBundleGetMainBundle());
+    (void)argv0; // unused
     CFURLGetFileSystemRepresentation(url,true,(UInt8*)program_dir,MAXPATHLEN);
     CFRelease(url);
     // Append trailing slash
@@ -85,10 +84,12 @@ void Set_program_directory(const char * argv0,char * program_dir)
   
   // AmigaOS and alike: hard-coded volume name.
   #elif defined(__amigaos4__) || defined(__AROS__) || defined(__MORPHOS__) || defined(__amigaos__)
+    (void)argv0; // unused
     strcpy(program_dir,"PROGDIR:");
   #elif defined(__MINT__)
   static char path[1024]={0};
   char currentDrive='A';
+  (void)argv0; // unused
   currentDrive=currentDrive+Dgetdrv();
   
   Dgetpath(path,0);
@@ -96,6 +97,7 @@ void Set_program_directory(const char * argv0,char * program_dir)
   // Append trailing slash
   strcat(program_dir,PATH_SEPARATOR);
   #elif defined(__ANDROID__)
+  (void)argv0; // unused
   getcwd(program_dir, MAX_PATH_CHARACTERS);
   strcat(program_dir, "/");
   // Linux: argv[0] unreliable
diff --git a/src/text.c b/src/text.c
index 6c986021..a5ffafce 100644
--- a/src/text.c
+++ b/src/text.c
@@ -97,16 +97,15 @@ void Add_font(const char *name)
   T_Font * font;
   int size=strlen(name)+1;
   int index;
-  
+
   // Détermination du type:
 
 #if defined(__macosx__)
-
-  if (size < 6) return;
-  
   char strFontName[512];
   CFStringRef CFSFontName;// = CFSTR(name);
 
+  if (size < 6) return;
+
   CFSFontName = CFStringCreateWithBytes(NULL, (UInt8 *) name, size - 1, kCFStringEncodingASCII, false);
   // Fix some funny names
   CFStringGetCString(CFSFontName, strFontName, 512, kCFStringEncodingASCII);
@@ -652,14 +651,14 @@ byte *Render_text_SFont(const char *str, int font_number, int *width, int *heigh
 // et retourne l'adresse du bloc d'octets.
 byte *Render_text(const char *str, int font_number, int size, int antialias, int bold, int italic, int *width, int *height, T_Palette palette)
 {
+  T_Font *font = font_list_start;
+  int index=font_number;
   #ifdef NOTTF
     (void) size; // unused
     (void) antialias; // unused
     (void) bold; // unused
     (void) italic; // unused
   #endif
-  T_Font *font = font_list_start;
-  int index=font_number;
   
   // Verification type de la fonte
   if (font_number<0 ||font_number>=Nb_fonts)