diff options
| author | cvs2svn <cvs2svn@FreeBSD.org> | 2003-03-29 09:53:18 +0000 |
|---|---|---|
| committer | cvs2svn <cvs2svn@FreeBSD.org> | 2003-03-29 09:53:18 +0000 |
| commit | 2c36078d184e6b3fde44793800a6c8ca0b0639f1 (patch) | |
| tree | 19d35773be783fd6761833f599af82301c20ceac /archivers/ark/files/patch-ksimcpu.cpp | |
| parent | 46e9a484f814c07d51ab2cb90517f4f5c4c368ae (diff) | |
This commit was manufactured by cvs2svn to create tag 'RELEASE_4_8_0'.release/4.8.0
Diffstat (limited to 'archivers/ark/files/patch-ksimcpu.cpp')
| -rw-r--r-- | archivers/ark/files/patch-ksimcpu.cpp | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/archivers/ark/files/patch-ksimcpu.cpp b/archivers/ark/files/patch-ksimcpu.cpp deleted file mode 100644 index 38fa88cabeec..000000000000 --- a/archivers/ark/files/patch-ksimcpu.cpp +++ /dev/null @@ -1,31 +0,0 @@ ---- ksim/monitors/cpu/ksimcpu.cpp.orig Mon May 13 10:47:51 2002 -+++ ksim/monitors/cpu/ksimcpu.cpp Mon Mar 17 13:26:46 2003 -@@ -42,8 +42,16 @@ - #include <themetypes.h> - - #ifdef Q_OS_BSD4 --#include <sys/dkstat.h> - #include <sys/param.h> -+#ifdef Q_OS_FREEBSD -+#if __FreeBSD_version < 500101 -+#include <sys/dkstat.h> -+#else -+#include <sys/resource.h> -+#endif -+#else -+#include <sys/dkstat.h> -+#endif - #include <sys/sysctl.h> - #include <string.h> - #include <kvm.h> -@@ -246,8 +254,8 @@ - static int oidCpuTime[CTL_MAXNAME + 2]; - static size_t oidCpuTimeLen = sizeof(oidCpuTime); - long cpuTime[CPUSTATES]; -- unsigned int cpuTimeLen = sizeof(cpuTime); -- static char *name = "kern.cp_time"; -+ size_t cpuTimeLen = sizeof(cpuTime); -+ static const char *name = "kern.cp_time"; - static int initialized = 0; - - if (!initialized) { |