diff --git a/src/config.h b/src/config.h
index 08a65f5..8daf6a8 100644
--- a/src/config.h
+++ b/src/config.h
@@ -29,7 +29,7 @@
 		#define USE_GETTEXT_BOOLSTRING "0"
 	#endif
 
-	#define BUILD_INFO "NON-CMAKE RUN_IN_PLACE="RUN_IN_PLACE_BOOLSTRING" USE_GETTEXT="USE_GETTEXT_BOOLSTRING" BUILD_TYPE="BUILD_TYPE
+	#define BUILD_INFO "NON-CMAKE RUN_IN_PLACE=" RUN_IN_PLACE_BOOLSTRING " USE_GETTEXT=" USE_GETTEXT_BOOLSTRING " BUILD_TYPE=" BUILD_TYPE
 #endif
 #endif
 
diff --git a/src/porting.cpp b/src/porting.cpp
index 58198ea..a5bf5d6 100644
--- a/src/porting.cpp
+++ b/src/porting.cpp
@@ -216,7 +216,7 @@ void initializePaths(char* argv0)
 	/*
 		Linux
 	*/
-	#elif defined(linux)
+	#elif defined(linux) || defined(__linux)
 	#include <unistd.h>
 
 	char buf[BUFSIZ];
diff --git a/src/socket.cpp b/src/socket.cpp
index bb0b9e1..f4758f4 100644
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -437,7 +437,7 @@ bool TCPSocket::Connect(const Address &destination)
 void TCPSocket::Send(const void *data, int size)
 {
 	int flags = 0;
-#if defined(linux)
+#if defined(linux) || defined(__linux)
 	flags = MSG_NOSIGNAL;
 #endif
 	int sent = send(m_handle, (const char*)data, size, flags);