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.

diff --git a/src/guiChatConsole.cpp b/src/guiChatConsole.cpp
index bb58d13050a0a8ba8c969cf8381ac3741ba0574f..8dd5ab032628c544956fefda705a84be4a4b53b6 100644 (file)
--- a/src/guiChatConsole.cpp
+++ b/src/guiChatConsole.cpp
@@ -630,7 +630,7 @@ bool GUIChatConsole::OnEvent(const SEvent& event)
                }
                else if(event.KeyInput.Char != 0 && !event.KeyInput.Control)
                {
-                       #if (defined(linux) || defined(__linux))
+                       #if (defined(__linux__))
                                wchar_t wc = L'_';
                                mbtowc( &wc, (char *) &event.KeyInput.Char, sizeof(event.KeyInput.Char) );
                                prompt.input(wc);

diff --git a/src/intlGUIEditBox.cpp b/src/intlGUIEditBox.cpp
index 33bf8a13cfb22e155cac32ce0e0cea53ac9b4f1c..29f82807653a11340535fc1555b764a7b020c7c4 100644 (file)
--- 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

diff --git a/src/porting.cpp b/src/porting.cpp
index 7ded58b3fe14788a44a534a0c8ea0063c64dd254..02ce6174b881eeb0e64955649a1d8b43b6b51e48 100644 (file)
--- a/src/porting.cpp
+++ b/src/porting.cpp
@@ -258,7 +258,7 @@ bool getCurrentExecPath(char *buf, size_t len)
 
 
 //// Linux
-#elif defined(linux) || defined(__linux) || defined(__linux__)
+#elif defined(__linux__)
 
 bool getCurrentExecPath(char *buf, size_t len)
 {
@@ -374,7 +374,7 @@ bool setSystemPaths()
 
 
 //// Linux
-#elif defined(linux) || defined(__linux)
+#elif defined(__linux__)
 
 bool setSystemPaths()
 {

diff --git a/src/porting.h b/src/porting.h
index 4d51c5058cd3c0d1acff734c799d932ac73a29ba..d101a7324d8e402ac1d2816c4fb7cb72f43eb540 100644 (file)
--- a/src/porting.h
+++ b/src/porting.h
@@ -60,7 +60,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
        #include <unistd.h>
        #include <stdint.h> //for uintptr_t
 
-       #if (defined(linux) || defined(__linux) || defined(__GNU__)) && !defined(_GNU_SOURCE)
+       // Use standard Posix macro for Linux
+       #if (defined(linux) || defined(__linux)) && !defined(__linux__)
+               #define __linux__ 
+       #endif
+       #if (defined(__linux__) || defined(__GNU__)) && !defined(_GNU_SOURCE)
                #define _GNU_SOURCE
        #endif
 
@@ -321,7 +325,7 @@ inline const char *getPlatformName()
        return
 #if defined(ANDROID)
        "Android"
-#elif defined(linux) || defined(__linux) || defined(__linux__)
+#elif defined(__linux__)
        "Linux"
 #elif defined(_WIN32) || defined(_WIN64)
        "Windows"

diff --git a/src/threading/thread.cpp b/src/threading/thread.cpp
index 5161a6c0189f41712b8147becea359194847ee2a..0cd536795f6eab1df44c6f05825fde31b2e687ea 100644 (file)
--- a/src/threading/thread.cpp
+++ b/src/threading/thread.cpp
@@ -54,7 +54,7 @@ DEALINGS IN THE SOFTWARE.
 
 
 // for setName
-#if defined(linux) || defined(__linux)
+#if defined(__linux__)
        #include <sys/prctl.h>
 #elif defined(__FreeBSD__) || defined(__OpenBSD__)
        #include <pthread_np.h>
@@ -70,7 +70,7 @@ DEALINGS IN THE SOFTWARE.
 // for bindToProcessor
 #if __FreeBSD_version >= 702106
        typedef cpuset_t cpu_set_t;
-#elif defined(__linux) || defined(linux)
+#elif defined(__linux__)
        #include <sched.h>
 #elif defined(__sun) || defined(sun)
        #include <sys/types.h>
@@ -261,7 +261,7 @@ DWORD WINAPI Thread::threadProc(LPVOID param)
 
 void Thread::setName(const std::string &name)
 {
-#if defined(linux) || defined(__linux)
+#if defined(__linux__)
 
        // It would be cleaner to do this with pthread_setname_np,
        // which was added to glibc in version 2.12, but some major
@@ -363,7 +363,7 @@ bool Thread::bindToProcessor(unsigned int proc_number)
 
        return SetThreadAffinityMask(getThreadHandle(), 1 << proc_number);
 
-#elif __FreeBSD_version >= 702106 || defined(__linux) || defined(linux)
+#elif __FreeBSD_version >= 702106 || defined(__linux__)
 
        cpu_set_t cpuset;