From 859f762814a408fabd22171baeba9f1d13e76eda Mon Sep 17 00:00:00 2001
From: Frank Gevaerts <frank@gevaerts.be>
Date: Sat, 20 Jul 2019 22:06:30 +0200
Subject: [PATCH] Move get_codepage_name() back out of #ifdef HAVE_LCD_BITMAP

55eb1c54 accidentally put it there.

Change-Id: I25d1984f7d4a1e6d65d23aafab5eefea4f92322e
---
 apps/plugin.c | 4 +---
 apps/plugin.h | 8 +++-----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/apps/plugin.c b/apps/plugin.c
index 12bfe485e5..f9cef981bf 100644
--- a/apps/plugin.c
+++ b/apps/plugin.c
@@ -262,10 +262,7 @@ static const struct plugin_api rockbox_api = {
     &button_queue,
 #endif
     bidi_l2v,
-#ifdef HAVE_LCD_BITMAP
     is_diacritic,
-    get_codepage_name,
-#endif
     font_get_bits,
     font_load,
     font_unload,
@@ -275,6 +272,7 @@ static const struct plugin_api rockbox_api = {
     screen_clear_area,
     gui_scrollbar_draw,
 #endif /* HAVE_LCD_BITMAP */
+    get_codepage_name,
 
 #ifdef HAVE_REMOTE_LCD
     /* remote lcd */
diff --git a/apps/plugin.h b/apps/plugin.h
index a83960b260..c737d7adeb 100644
--- a/apps/plugin.h
+++ b/apps/plugin.h
@@ -161,12 +161,12 @@ void* plugin_get_buffer(size_t *buffer_size);
 #define PLUGIN_MAGIC 0x526F634B /* RocK */
 
 /* increase this every time the api struct changes */
-#define PLUGIN_API_VERSION 236
+#define PLUGIN_API_VERSION 237
 
 /* update this to latest version if a change to the api struct breaks
    backwards compatibility (and please take the opportunity to sort in any
    new function which are "waiting" at the end of the function table) */
-#define PLUGIN_MIN_API_VERSION 236
+#define PLUGIN_MIN_API_VERSION 237
 
 /* plugin return codes */
 /* internal returns start at 0x100 to make exit(1..255) work */
@@ -288,10 +288,7 @@ struct plugin_api {
     struct event_queue *button_queue;
 #endif
     unsigned short *(*bidi_l2v)( const unsigned char *str, int orientation );
-#ifdef HAVE_LCD_BITMAP
     bool (*is_diacritic)(const unsigned short char_code, bool *is_rtl);
-    const char* (*get_codepage_name)(int cp);
-#endif
     const unsigned char *(*font_get_bits)( struct font *pf, unsigned short char_code );
     int (*font_load)(const char *path);
     void (*font_unload)(int font_id);
@@ -306,6 +303,7 @@ struct plugin_api {
                                int min_shown, int max_shown,
                                unsigned flags);
 #endif  /* HAVE_LCD_BITMAP */
+    const char* (*get_codepage_name)(int cp);
 
 #ifdef HAVE_REMOTE_LCD
     /* remote lcd */