summaryrefslogtreecommitdiffstats
path: root/Source/kwsys/SystemInformation.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-08-03 14:10:28 (GMT)
committerBrad King <brad.king@kitware.com>2016-08-03 14:10:28 (GMT)
commitb602cb85c90bba26bff04d570bf108658016cf07 (patch)
treeb934631ea9c7687fe558b1a69400c564afe595e0 /Source/kwsys/SystemInformation.cxx
parent382c4fca6b895c2c7a68445918a8fd73a15e1f91 (diff)
parent3e6ec47c421808123efac2cf67850f8b75839c67 (diff)
downloadCMake-b602cb85c90bba26bff04d570bf108658016cf07.zip
CMake-b602cb85c90bba26bff04d570bf108658016cf07.tar.gz
CMake-b602cb85c90bba26bff04d570bf108658016cf07.tar.bz2
Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys: KWSys 2016-08-02 (3f55579d)
Diffstat (limited to 'Source/kwsys/SystemInformation.cxx')
-rw-r--r--Source/kwsys/SystemInformation.cxx15
1 files changed, 3 insertions, 12 deletions
diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx
index 81fb2f9..56a635a 100644
--- a/Source/kwsys/SystemInformation.cxx
+++ b/Source/kwsys/SystemInformation.cxx
@@ -79,9 +79,9 @@ typedef int siginfo_t;
# undef _WIN32
#endif
-#ifdef __FreeBSD__
+#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+# include <sys/param.h>
# include <sys/sysctl.h>
-# include <fenv.h>
# include <sys/socket.h>
# include <netdb.h>
# include <netinet/in.h>
@@ -91,19 +91,10 @@ typedef int siginfo_t;
# endif
#endif
-#if defined(__OpenBSD__) || defined(__NetBSD__)
-# include <sys/param.h>
-# include <sys/sysctl.h>
-#endif
-
#if defined(KWSYS_SYS_HAS_MACHINE_CPU_H)
# include <machine/cpu.h>
#endif
-#if defined(__DragonFly__)
-# include <sys/sysctl.h>
-#endif
-
#ifdef __APPLE__
# include <sys/sysctl.h>
# include <mach/vm_statistics.h>
@@ -123,7 +114,7 @@ typedef int siginfo_t;
# endif
#endif
-#ifdef __linux
+#if defined(__linux) || defined (__sun) || defined(_SCO_DS)
# include <fenv.h>
# include <sys/socket.h>
# include <netdb.h>