From 1dfd977ec43370da6931b11a8d0469792c8ebc36 Mon Sep 17 00:00:00 2001 From: Rogier-5 Date: Mon, 4 Jul 2016 21:00:57 +0200 Subject: Fix & make linux conditionals uniform (#4278) The source used a hodge-podge of different combinations of different macros to check for linux: 'linux', '__linux', '__linux__'. As '__linux__' is standard (Posix), and the others are not, the source now uniformly uses __linux__. If either linux or __linux are defined, it is made sure that __linux__ is defined as well. --- src/intlGUIEditBox.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/intlGUIEditBox.cpp') diff --git a/src/intlGUIEditBox.cpp b/src/intlGUIEditBox.cpp index 33bf8a13c..29f828076 100644 --- a/src/intlGUIEditBox.cpp +++ b/src/intlGUIEditBox.cpp @@ -271,7 +271,7 @@ bool intlGUIEditBox::OnEvent(const SEvent& event) break; case EET_KEY_INPUT_EVENT: { -#if (defined(linux) || defined(__linux) || defined(__FreeBSD__)) +#if (defined(__linux__) || defined(__FreeBSD__)) // ################################################################ // ValkaTR: // This part is the difference from the original intlGUIEditBox -- cgit v1.2.3