From ec1323d9ee1ab4d241078a150044395c822517c5 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sun, 8 Jan 2017 11:52:04 -0500 Subject: [PATCH] util: Migrated osName to libshared --- src/calc.cpp | 2 +- src/commands/CmdDiagnostics.cpp | 2 +- src/util.cpp | 28 ---------------------------- src/util.h | 1 - 4 files changed, 2 insertions(+), 31 deletions(-) diff --git a/src/calc.cpp b/src/calc.cpp index cfd9c7464..2bc291c3a 100644 --- a/src/calc.cpp +++ b/src/calc.cpp @@ -33,8 +33,8 @@ #include #include #include +#include #include -#include #include Context context; diff --git a/src/commands/CmdDiagnostics.cpp b/src/commands/CmdDiagnostics.cpp index 1fa5e6ca7..30dc1fcce 100644 --- a/src/commands/CmdDiagnostics.cpp +++ b/src/commands/CmdDiagnostics.cpp @@ -34,8 +34,8 @@ #include #include #include +#include #include -#include #ifdef HAVE_COMMIT #include #endif diff --git a/src/util.cpp b/src/util.cpp index 5184d0c35..fa51defcb 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -258,34 +258,6 @@ time_t timegm (struct tm *tm) } #endif -//////////////////////////////////////////////////////////////////////////////// -std::string osName () -{ -#if defined (DARWIN) - return "Darwin"; -#elif defined (SOLARIS) - return "Solaris"; -#elif defined (CYGWIN) - return "Cygwin"; -#elif defined (HAIKU) - return "Haiku"; -#elif defined (OPENBSD) - return "OpenBSD"; -#elif defined (FREEBSD) - return "FreeBSD"; -#elif defined (NETBSD) - 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 -} - //////////////////////////////////////////////////////////////////////////////// bool nontrivial (const std::string& input) { diff --git a/src/util.h b/src/util.h index 55de9fd52..d12d80af8 100644 --- a/src/util.h +++ b/src/util.h @@ -60,7 +60,6 @@ const std::vector extractParents ( time_t timegm (struct tm *tm); #endif -std::string osName (); bool nontrivial (const std::string&); int strippedLength (const std::string&); const char* optionalBlankLine ();