From 0f4dbcfc5390e2eac8a014f29567c6030edf5b5d Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 15 Apr 2021 17:37:50 +0200 Subject: [PATCH] move arrays over to only function that uses them --- retroarch.c | 18 ++++++++++++++++++ retroarch_data.h | 21 --------------------- 2 files changed, 18 insertions(+), 21 deletions(-) diff --git a/retroarch.c b/retroarch.c index 221a08d54e..85c5377cd9 100644 --- a/retroarch.c +++ b/retroarch.c @@ -23445,6 +23445,24 @@ static void input_event_osk_iterate( void *osk_grid, enum osk_type osk_idx) { +#ifndef HAVE_LANGEXTRA + /* If HAVE_LANGEXTRA is not defined, define some ASCII-friendly pages. */ + static const char *uppercase_grid[] = { + "1","2","3","4","5","6","7","8","9","0","Bksp", + "Q","W","E","R","T","Y","U","I","O","P","Enter", + "A","S","D","F","G","H","J","K","L","+","Lower", + "Z","X","C","V","B","N","M"," ","_","/","Next"}; + static const char *lowercase_grid[] = { + "1","2","3","4","5","6","7","8","9","0","Bksp", + "q","w","e","r","t","y","u","i","o","p","Enter", + "a","s","d","f","g","h","j","k","l","@","Upper", + "z","x","c","v","b","n","m"," ","-",".","Next"}; + static const char *symbols_page1_grid[] = { + "1","2","3","4","5","6","7","8","9","0","Bksp", + "!","\"","#","$","%","&","'","*","(",")","Enter", + "+",",","-","~","/",":",";","=","<",">","Lower", + "?","@","[","\\","]","^","_","|","{","}","Next"}; +#endif switch (osk_idx) { #ifdef HAVE_LANGEXTRA diff --git a/retroarch_data.h b/retroarch_data.h index 2a60b6e3c2..924e992d2e 100644 --- a/retroarch_data.h +++ b/retroarch_data.h @@ -405,27 +405,6 @@ #define MENU_MAX_MBUTTONS 32 /* Enough to cover largest libretro constant*/ #endif -#ifndef HAVE_LANGEXTRA -/* If HAVE_LANGEXTRA is not defined, define some ASCII-friendly pages. */ -static const char *symbols_page1_grid[] = { - "1","2","3","4","5","6","7","8","9","0","Bksp", - "!","\"","#","$","%","&","'","*","(",")","Enter", - "+",",","-","~","/",":",";","=","<",">","Lower", - "?","@","[","\\","]","^","_","|","{","}","Next"}; - -static const char *uppercase_grid[] = { - "1","2","3","4","5","6","7","8","9","0","Bksp", - "Q","W","E","R","T","Y","U","I","O","P","Enter", - "A","S","D","F","G","H","J","K","L","+","Lower", - "Z","X","C","V","B","N","M"," ","_","/","Next"}; - -static const char *lowercase_grid[] = { - "1","2","3","4","5","6","7","8","9","0","Bksp", - "q","w","e","r","t","y","u","i","o","p","Enter", - "a","s","d","f","g","h","j","k","l","@","Upper", - "z","x","c","v","b","n","m"," ","-",".","Next"}; -#endif - /* DRIVERS */ audio_driver_t audio_null = {