From fa932118b9ab9bffa96c1e73ab4aa982f60292cb Mon Sep 17 00:00:00 2001 From: victor Date: Sat, 11 Sep 2004 15:37:50 +0000 Subject: correct revision 2191 git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@2192 63ad8ddf-47c3-0310-b6dd-a9e9d9715204 --- mbbsd/osdep.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'mbbsd/osdep.c') 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 #include #include @@ -459,6 +457,12 @@ double swapused(int *total, int *used) return percent; } +#endif + +#if __FreeBSD__ + +#include + double swapused(int *total, int *used) -- cgit v1.2.3