From bebaab76295e15fa207baa4361402874e4891641 Mon Sep 17 00:00:00 2001 From: Doug MacEachern Date: Wed, 4 Jan 2006 23:13:35 +0000 Subject: [PATCH] backout last change. sysctl swap stuff compiled on freebsd4 but doesnt work --- src/os/darwin/darwin_sigar.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/os/darwin/darwin_sigar.c b/src/os/darwin/darwin_sigar.c index bf691130..5dd477cd 100644 --- a/src/os/darwin/darwin_sigar.c +++ b/src/os/darwin/darwin_sigar.c @@ -288,18 +288,7 @@ int sigar_mem_get(sigar_t *sigar, sigar_mem_t *mem) #define SWI_MAXMIB 3 -#ifndef XSWDEV_VERSION -#define XSWDEV_VERSION 1 -struct xswdev { - u_int xsw_version; - udev_t xsw_dev; - int xsw_flags; - int xsw_nblks; - int xsw_used; -}; -#endif - -#ifdef __FreeBSD__ +#ifdef SIGAR_FREEBSD5 /* code in this function is based on FreeBSD 5.3 kvm_getswapinfo.c */ static int getswapinfo_sysctl(struct kvm_swap *swap_ary, int swap_max) @@ -365,6 +354,8 @@ static int getswapinfo_sysctl(struct kvm_swap *swap_ary, return SIGAR_OK; } +#else +#define getswapinfo_sysctl(swap_ary, swap_max) SIGAR_ENOTIMPL #endif int sigar_swap_get(sigar_t *sigar, sigar_swap_t *swap)