From a5916aa20b0c588d221c3b89f53222afd9c1713e Mon Sep 17 00:00:00 2001 From: abv Date: Sun, 1 Nov 2015 11:57:26 +0300 Subject: [PATCH] 0022325: Patch to fix a build failure on GNU/kFreeBSD --- src/OSD/OSD_Path.cxx | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/OSD/OSD_Path.cxx b/src/OSD/OSD_Path.cxx index f544ac4816..ab3534b3d6 100644 --- a/src/OSD/OSD_Path.cxx +++ b/src/OSD/OSD_Path.cxx @@ -21,34 +21,26 @@ #include #include -static OSD_SysType whereAmI() { -#if defined(__digital__) || defined(__FreeBSD__) || defined(SUNOS) || defined(__APPLE__) || defined(__QNX__) +static OSD_SysType whereAmI() +{ +#if defined(__digital__) || defined(__FreeBSD__) || defined(SUNOS) || defined(__APPLE__) || defined(__QNX__) || defined(__FreeBSD_kernel__) return OSD_UnixBSD; -} #elif defined(sgi) || defined(IRIX) || defined(__sun) || defined(SOLARIS) || defined(__sco__) || defined(__hpux) || defined(HPUX) return OSD_UnixSystemV; -} #elif defined(__osf__) || defined(DECOSF1) return OSD_OSF; -} #elif defined(OS2) return OSD_WindowsNT; -} #elif defined(_WIN32) || defined(__WIN32__) return OSD_WindowsNT; -} #elif defined(__CYGWIN32_) || defined(__MINGW32__) return OSD_WindowsNT; -} #elif defined(vax) || defined(__vms) return OSD_VMS; -} #elif defined(__linux__) || defined(__linux) return OSD_LinuxREDHAT; -} #elif defined(_AIX) || defined(AIX) return OSD_Aix; -} #else struct utsname info; uname(&info); @@ -58,8 +50,8 @@ static OSD_SysType whereAmI() { cout << info.version << endl; cout << info.machine << endl; return OSD_Default; -} #endif +} #if !(defined(_WIN32) || defined(__WIN32__))