diff options
| author | jhb <jhb@FreeBSD.org> | 2003-03-18 18:20:11 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2003-03-18 18:20:11 +0000 |
| commit | dbd1515501fc7194b2150807c08c1dec31f721f2 (patch) | |
| tree | 4b565f67f9a4cb32c16a66e3320c763a6b494421 /security | |
| parent | a2f821e52341305147002fd13b451be5ecd6293b (diff) | |
| download | FreeBSD-ports-dbd1515501fc7194b2150807c08c1dec31f721f2.zip FreeBSD-ports-dbd1515501fc7194b2150807c08c1dec31f721f2.tar.gz | |
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
Diffstat (limited to 'security')
| -rw-r--r-- | security/kgpg-kde4/files/patch-ksimcpu.cpp | 26 | ||||
| -rw-r--r-- | security/kwallet/files/patch-ksimcpu.cpp | 26 |
2 files changed, 28 insertions, 24 deletions
diff --git a/security/kgpg-kde4/files/patch-ksimcpu.cpp b/security/kgpg-kde4/files/patch-ksimcpu.cpp index 0dbf177..38fa88c 100644 --- a/security/kgpg-kde4/files/patch-ksimcpu.cpp +++ b/security/kgpg-kde4/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) { diff --git a/security/kwallet/files/patch-ksimcpu.cpp b/security/kwallet/files/patch-ksimcpu.cpp index 0dbf177..38fa88c 100644 --- a/security/kwallet/files/patch-ksimcpu.cpp +++ b/security/kwallet/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) { |
