From 5cfd7b0cc6b1a34c9c472530d975e57dfa117a5d Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sat, 13 Apr 2013 14:49:59 -0400 Subject: [PATCH] Portability - Added support for GNU/Hurd and GNU/kFreeBSD systems (thanks to Jakub Wilk). --- CMakeLists.txt | 4 ++++ cmake.h.in | 2 ++ src/DOM.cpp | 4 ++++ src/commands/CmdDiagnostics.cpp | 4 ++++ src/commands/CmdVersion.cpp | 4 ++++ 5 files changed, 18 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index dad6e188c..fd68b59bf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,6 +26,10 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "NetBSD") set (NETBSD true) elseif (${CMAKE_SYSTEM_NAME} MATCHES "SunOS") set (SOLARIS true) +elseif (${CMAKE_SYSTEM_NAME} MATCHES "GNU/kFreeBSD") + set (KFREEBSD true) +elseif (${CMAKE_SYSTEM_NAME} MATCHES "GNU/Hurd") + set (GNUHURD true) else (${CMAKE_SYSTEM_NAME} MATCHES "Linux") set (UNKNOWN true) endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux") diff --git a/cmake.h.in b/cmake.h.in index 41c38c92b..cd2be5e70 100644 --- a/cmake.h.in +++ b/cmake.h.in @@ -35,6 +35,8 @@ #cmakedefine NETBSD #cmakedefine HAIKU #cmakedefine SOLARIS +#cmakedefine KFREEBSD +#cmakedefine GNUHURD #cmakedefine UNKNOWN /* Found the GnuTLS library */ diff --git a/src/DOM.cpp b/src/DOM.cpp index 14040dbbc..776a2ffdd 100644 --- a/src/DOM.cpp +++ b/src/DOM.cpp @@ -124,6 +124,10 @@ const std::string DOM::get (const std::string& name) return "NetBSD"; #elif defined (LINUX) return "Linux"; +#elif defined (KFREEBSD) + return "GNU/kFreeBSD"; +#elif defined (GNUHURD) + return "GNU/Hurd"; #else return STRING_DOM_UNKNOWN; #endif diff --git a/src/commands/CmdDiagnostics.cpp b/src/commands/CmdDiagnostics.cpp index 5eb890674..54620b378 100644 --- a/src/commands/CmdDiagnostics.cpp +++ b/src/commands/CmdDiagnostics.cpp @@ -87,6 +87,10 @@ int CmdDiagnostics::execute (std::string& output) "NetBSD" #elif defined (LINUX) "Linux" +#elif defined (KFREEBSD) + "GNU/kFreeBSD" +#elif defined (GNUHURD) + "GNU/Hurd" #else STRING_CMD_DIAG_UNKNOWN #endif diff --git a/src/commands/CmdVersion.cpp b/src/commands/CmdVersion.cpp index 93a54fdc3..2088ea379 100644 --- a/src/commands/CmdVersion.cpp +++ b/src/commands/CmdVersion.cpp @@ -88,6 +88,10 @@ int CmdVersion::execute (std::string& output) << "netbsd" #elif defined (LINUX) << "linux" +#elif defined (KFREEBSD) + "gnu-kfreebsd" +#elif defined (GNUHURD) + << "gnu-hurd" #else << STRING_CMD_VERSION_UNKNOWN #endif