Fix path detection with --std= parameter

est31 · est31 · commit 4abb96fb546b · 2015-04-17T05:12:06.000+02:00
Fixes path detection when compilers have been told to follow a standard, e.g. with -DCMAKE_CXX_FLAGS=--std=c++98.
To see the passed defines, try this with and without the --std parameter:
gcc -E -dM --std=c99 - &lt; /dev/null | grep linux
diff --git a/src/porting.cpp b/src/porting.cpp
@@ -369,7 +369,7 @@ void initializePaths()
 	/*
 		Linux
 	*/
-	#elif defined(linux)
+	#elif defined(linux) || defined(__linux)
 
 	char buf[BUFSIZ];
 	memset(buf, 0, BUFSIZ);
@@ -465,7 +465,7 @@ void initializePaths()
 	/*
 		Linux
 	*/
-	#elif defined(linux)
+	#elif defined(linux) || defined(__linux)
 
 	// Get path to executable
 	std::string bindir = "";
