diff options
| author | David E. O'Brien <obrien@FreeBSD.org> | 2001-08-22 22:22:06 +0000 |
|---|---|---|
| committer | David E. O'Brien <obrien@FreeBSD.org> | 2001-08-22 22:22:06 +0000 |
| commit | b616bcf191cad835f12eb1dd9e66b93701dc0644 (patch) | |
| tree | 05118be11906071b33202a58ccc7ab2f333abc04 /sysutils | |
| parent | Update to 20010823. I feel it's getting as stable as before... :) (diff) | |
Use a consistant 64-bit int type.
Notes
Notes:
svn path=/head/; revision=46659
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/xosview/files/patch-kernel.cc | 2 | ||||
| -rw-r--r-- | sysutils/xosview/files/patch-kernel.h | 2 | ||||
| -rw-r--r-- | sysutils/xosview/files/patch-swapinternal.cc | 8 | ||||
| -rw-r--r-- | sysutils/xosview/files/patch-swapinternal.h | 4 | ||||
| -rw-r--r-- | sysutils/xosview/files/patch-swapmeter.cc | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/sysutils/xosview/files/patch-kernel.cc b/sysutils/xosview/files/patch-kernel.cc index d3c6b04fe453..9d2909e3d4a7 100644 --- a/sysutils/xosview/files/patch-kernel.cc +++ b/sysutils/xosview/files/patch-kernel.cc @@ -26,7 +26,7 @@ void -BSDGetSwapCtlInfo(int *totalp, int *freep) { -+BSDGetSwapCtlInfo(long *totalp, long *freep) { ++BSDGetSwapCtlInfo(int64_t *totalp, int64_t *freep) { int totalinuse, totalsize; int rnswap, nswap = swapctl(SWAP_NSWAP, 0, 0); struct swapent *swapiter; diff --git a/sysutils/xosview/files/patch-kernel.h b/sysutils/xosview/files/patch-kernel.h index bd90af38fa05..ce5e565099b6 100644 --- a/sysutils/xosview/files/patch-kernel.h +++ b/sysutils/xosview/files/patch-kernel.h @@ -5,7 +5,7 @@ #ifdef HAVE_SWAPCTL void -BSDGetSwapCtlInfo(int* total, int* free); -+BSDGetSwapCtlInfo(long* total, long* free); ++BSDGetSwapCtlInfo(int64_t* total, int64_t* free); #endif int diff --git a/sysutils/xosview/files/patch-swapinternal.cc b/sysutils/xosview/files/patch-swapinternal.cc index 17d6fe93d744..374581f309b4 100644 --- a/sysutils/xosview/files/patch-swapinternal.cc +++ b/sysutils/xosview/files/patch-swapinternal.cc @@ -5,11 +5,11 @@ void -BSDGetSwapInfo(int* total, int* free) -+BSDGetSwapInfo(long* total, long* free) ++BSDGetSwapInfo(int64_t* total, int64_t* free) { - int i, avail, npfree, used=0, xsize, xfree; + int i, npfree, xsize, xfree; -+ long avail, used=0; ++ int64_t avail, used=0; fetchswap(); #ifdef USE_KVM_GETSWAPINFO @@ -17,8 +17,8 @@ if (kvnsw == 0) { - avail += pagesize * kvmsw[0].ksw_total; - used += pagesize * kvmsw[0].ksw_used; -+ avail += pagesize * (long)kvmsw[0].ksw_total; -+ used += pagesize * (long)kvmsw[0].ksw_used; ++ avail += pagesize * (int64_t)kvmsw[0].ksw_total; ++ used += pagesize * (int64_t)kvmsw[0].ksw_used; } *total = avail; *free = avail - used; diff --git a/sysutils/xosview/files/patch-swapinternal.h b/sysutils/xosview/files/patch-swapinternal.h index 1490023036f1..18334202b0cd 100644 --- a/sysutils/xosview/files/patch-swapinternal.h +++ b/sysutils/xosview/files/patch-swapinternal.h @@ -5,8 +5,8 @@ void -BSDGetSwapInfo(int* total, int* free); -+BSDGetSwapInfo(long* total, long* free); ++BSDGetSwapInfo(int64_t* total, int64_t* free); void -BSDGetSwapCtlInfo(int* total, int* free); -+BSDGetSwapCtlInfo(long* total, long* free); ++BSDGetSwapCtlInfo(int64_t* total, int64_t* free); diff --git a/sysutils/xosview/files/patch-swapmeter.cc b/sysutils/xosview/files/patch-swapmeter.cc index e1a9316f886d..bb07b5b60253 100644 --- a/sysutils/xosview/files/patch-swapmeter.cc +++ b/sysutils/xosview/files/patch-swapmeter.cc @@ -3,5 +3,5 @@ @@ -76,3 +76,3 @@ void SwapMeter::getswapinfo( void ){ - int total_int, free_int; -+ long total_int, free_int; ++ int64_t total_int, free_int; |