bughz
/
sigar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sigar-1.6'

This commit is contained in:
Doug MacEachern 2009-07-30 17:48:18 -07:00
parent 2733b90ee8 a355ba22c9
commit 2ee2b7a154
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/os/darwin/darwin_sigar.c
View File

@ -23,7 +23,9 @@
#include <sys/param.h> #include <sys/param.h>
#include <sys/mount.h> #include <sys/mount.h>
#ifdef DARWIN
#include <nfs/rpcv2.h> #include <nfs/rpcv2.h>
#endif
#include <nfs/nfsproto.h> #include <nfs/nfsproto.h>
#ifdef DARWIN #ifdef DARWIN
@ -2379,7 +2381,11 @@ int sigar_net_route_list_get(sigar_t *sigar,
if (sysctl(mib, NMIB(mib), NULL, &needed, NULL, 0) < 0) { if (sysctl(mib, NMIB(mib), NULL, &needed, NULL, 0) < 0) {
return errno; return errno;
} }
#if __FreeBSD_version >= 800000
if (needed == 0) {
return SIGAR_ENOTIMPL; /*XXX hoping this is an 8.0beta bug*/
}
#endif
buf = malloc(needed); buf = malloc(needed);
if (sysctl(mib, NMIB(mib), buf, &needed, NULL, 0) < 0) { if (sysctl(mib, NMIB(mib), buf, &needed, NULL, 0) < 0) {
@ -3221,7 +3227,7 @@ int sigar_nfs_server_v3_get(sigar_t *sigar,
return SIGAR_OK; return SIGAR_OK;
} }
#if defined(__FreeBSD__) #if defined(__FreeBSD__) && /*XXX*/ (__FreeBSD_version < 800000)
#define _KERNEL #define _KERNEL
#include <sys/file.h> #include <sys/file.h>