diff options
Diffstat (limited to 'mbbsd')
| -rw-r--r-- | mbbsd/osdep.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mbbsd/osdep.c b/mbbsd/osdep.c index b04a396a..1bca7208 100644 --- a/mbbsd/osdep.c +++ b/mbbsd/osdep.c @@ -174,8 +174,6 @@ strcasestr(const char *big, const char *little) * struct dirent (through namelist). Returns -1 if there were any errors. */ -<<<<<<< .working -======= #include <sys/types.h> #include <sys/stat.h> #include <dirent.h> @@ -459,6 +457,12 @@ double swapused(int *total, int *used) return percent; } +#endif + +#if __FreeBSD__ + +#include <kvm.h> + double swapused(int *total, int *used) |