From efd8d14585a9bf49ff5e90074f9424bf100e8632 Mon Sep 17 00:00:00 2001 From: William Kendrick Date: Thu, 20 Mar 2014 00:11:52 +0000 Subject: [PATCH] A few tweaks (including wrapping stuff in #ifdef __APPLE__) to make sure stuff still compiles under Linux, after applying Eric P.'s OSX changes. --- src/i18n.c | 2 ++ src/onscreen_keyboard.c | 2 ++ src/parse.gperf | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/i18n.c b/src/i18n.c index ebb1b5ef7..6b0db6584 100644 --- a/src/i18n.c +++ b/src/i18n.c @@ -844,7 +844,9 @@ int setup_i18n(const char *restrict lang, const char *restrict locale) if(lang) locale = language_to_locale(lang); +#ifdef __APPLE__ patch_i18n(locale); //EP +#endif return set_current_language(locale); } diff --git a/src/onscreen_keyboard.c b/src/onscreen_keyboard.c index f90ff64f1..ef937c758 100644 --- a/src/onscreen_keyboard.c +++ b/src/onscreen_keyboard.c @@ -1,4 +1,6 @@ +#ifdef __APPLE__ #include "patch.h" //EP +#endif #include "onscreen_keyboard.h" //#define DEBUG_OSK_COMPOSEMAP diff --git a/src/parse.gperf b/src/parse.gperf index d9ac1bcc7..a0f453a1e 100644 --- a/src/parse.gperf +++ b/src/parse.gperf @@ -13,7 +13,7 @@ #include #include #include "../src/parse.h" -#include "debug.h" +#include "../src/debug.h" const char PARSE_YES[] = "yes"; const char PARSE_NO[] = "no";