diff options
| author | victor <victor@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2004-09-11 23:37:50 +0800 |
|---|---|---|
| committer | victor <victor@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2004-09-11 23:37:50 +0800 |
| commit | fa932118b9ab9bffa96c1e73ab4aa982f60292cb (patch) | |
| tree | d45b1e286d8c530e1d468dcd3eeb2673dfa7063f /mbbsd | |
| parent | bbfe2ca8e47e795f28351d32581e1293d655a4b4 (diff) | |
| download | pttbbs-fa932118b9ab9bffa96c1e73ab4aa982f60292cb.tar pttbbs-fa932118b9ab9bffa96c1e73ab4aa982f60292cb.tar.gz pttbbs-fa932118b9ab9bffa96c1e73ab4aa982f60292cb.tar.bz2 pttbbs-fa932118b9ab9bffa96c1e73ab4aa982f60292cb.tar.lz pttbbs-fa932118b9ab9bffa96c1e73ab4aa982f60292cb.tar.xz pttbbs-fa932118b9ab9bffa96c1e73ab4aa982f60292cb.tar.zst pttbbs-fa932118b9ab9bffa96c1e73ab4aa982f60292cb.zip | |
correct revision 2191
git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@2192 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
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) |