diff options
author | John Baldwin <jhb@FreeBSD.org> | 2003-03-18 18:20:11 +0000 |
---|---|---|
committer | John Baldwin <jhb@FreeBSD.org> | 2003-03-18 18:20:11 +0000 |
commit | b20dd48b3d74f2100bb009da633ff3a9c0450da4 (patch) | |
tree | 8ce5d439b38b913a58a3f2f71424afab2d5df409 /math/kcalc | |
parent | Add a patch to cast pointers to intptr_t instead of int when performing (diff) |
Use a size_t to hold the result of sizeof() instead of an unsigned int.
Use a const char * instead of a char * type for a variable to quiet a
warning. These fix the build on alpha.
Requested by: kris
Notes
Notes:
svn path=/head/; revision=77152
Diffstat (limited to 'math/kcalc')
-rw-r--r-- | math/kcalc/files/patch-ksimcpu.cpp | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/math/kcalc/files/patch-ksimcpu.cpp b/math/kcalc/files/patch-ksimcpu.cpp index 0dbf177de206..38fa88cabeec 100644 --- a/math/kcalc/files/patch-ksimcpu.cpp +++ b/math/kcalc/files/patch-ksimcpu.cpp @@ -1,13 +1,6 @@ -Index: ksim/monitors/cpu/ksimcpu.cpp -=================================================================== -RCS file: /home/kde/kdeutils/ksim/monitors/cpu/ksimcpu.cpp,v -retrieving revision 1.21 -diff -u -5 -p -d -r1.21 ksimcpu.cpp ---- ksim/monitors/cpu/ksimcpu.cpp 13 May 2002 14:47:51 -0000 1.21 -+++ ksim/monitors/cpu/ksimcpu.cpp 3 Mar 2003 07:38:33 -0000 -@@ -40,12 +40,20 @@ - #include <chart.h> - #include <progress.h> +--- 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 @@ -25,5 +18,14 @@ diff -u -5 -p -d -r1.21 ksimcpu.cpp #include <sys/sysctl.h> #include <string.h> #include <kvm.h> - #ifdef Q_OS_NETBSD - #include <sys/sched.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) { |