diff options
author | Katja Marttila <katja.marttila@theqtcompany.com> | 2016-03-30 16:06:34 +0300 |
---|---|---|
committer | Katja Marttila <katja.marttila@theqtcompany.com> | 2016-04-26 08:55:05 +0000 |
commit | 220d18b41b836a0c10ea097a6f93c3f5d204bf50 (patch) | |
tree | 98632f032ef2af7112a9e6f33fde60c699f5e6a2 /src | |
parent | 5707b1e5e5ec9f113332f229b34df72788d3e03a (diff) |
Make IFW compile with FreeBSD
Change-Id: Ibebc25b738c843c0eb4291faa2bba7ac9836b008
Task-number: QTIFW-841
Reviewed-by: Ralf Nolden <nolden@kde.org>
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/libs/installer/adminauthorization_x11.cpp | 6 | ||||
-rw-r--r-- | src/libs/kdtools/kdsysinfo_x11.cpp | 9 |
2 files changed, 14 insertions, 1 deletions
diff --git a/src/libs/installer/adminauthorization_x11.cpp b/src/libs/installer/adminauthorization_x11.cpp index 97c6093ae..bf1d0c082 100644 --- a/src/libs/installer/adminauthorization_x11.cpp +++ b/src/libs/installer/adminauthorization_x11.cpp @@ -49,9 +49,13 @@ #include <linux/limits.h> #include <pty.h> #else +#ifdef Q_OS_FREEBSD +#include <libutil.h> +#include <signal.h> +#else #include <util.h> #endif - +#endif #include <sys/ioctl.h> #include <sys/types.h> #include <sys/wait.h> diff --git a/src/libs/kdtools/kdsysinfo_x11.cpp b/src/libs/kdtools/kdsysinfo_x11.cpp index e47734c7c..1cdf3d4e8 100644 --- a/src/libs/kdtools/kdsysinfo_x11.cpp +++ b/src/libs/kdtools/kdsysinfo_x11.cpp @@ -36,6 +36,11 @@ #include <sys/utsname.h> #include <sys/statvfs.h> +#ifdef Q_OS_FREEBSD +#include <sys/types.h> +#include <sys/sysctl.h> +#endif + #include <QtCore/QFile> #include <QtCore/QTextStream> #include <QtCore/QDir> @@ -62,7 +67,11 @@ quint64 installedMemory() #else quint64 physmem; size_t len = sizeof physmem; +#ifdef Q_OS_FREEBSD + static int mib[2] = { CTL_HW, HW_PHYSMEM }; +#else static int mib[2] = { CTL_HW, HW_MEMSIZE }; +#endif sysctl(mib, 2, &physmem, &len, 0, 0); return quint64(physmem); #endif |