From 6807bac55fc7361e79155c7eb3d239ac391b075d Mon Sep 17 00:00:00 2001 From: Rom Walton Date: Wed, 3 Aug 2005 19:26:43 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=7009 --- lib/hostinfo.h | 6 ------ lib/mem_usage.h | 25 +++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/lib/hostinfo.h b/lib/hostinfo.h index 9bf9e21508..aaafd47b46 100644 --- a/lib/hostinfo.h +++ b/lib/hostinfo.h @@ -20,10 +20,6 @@ #ifndef _HOSTINFO_ #define _HOSTINFO_ -#ifdef _WIN32 -#include "boinc_win.h" -#endif - #include "miofile.h" // Other host-specific info is kept in @@ -58,12 +54,10 @@ struct HOST_INFO { double d_total; // Total amount of diskspace in bytes double d_free; // Total amount of available diskspace in bytes - HOST_INFO(); int parse(MIOFILE&); int write(MIOFILE&); int parse_cpu_benchmarks(FILE*); int write_cpu_benchmarks(FILE*); - void print(); bool host_is_running_on_batteries(); bool users_idle(bool check_all_logins, double idle_time_to_run); diff --git a/lib/mem_usage.h b/lib/mem_usage.h index 0b666e107b..1cd9631561 100644 --- a/lib/mem_usage.h +++ b/lib/mem_usage.h @@ -1 +1,26 @@ +// Berkeley Open Infrastructure for Network Computing +// http://boinc.berkeley.edu +// Copyright (C) 2005 University of California +// +// This is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; +// either version 2.1 of the License, or (at your option) any later version. +// +// This software is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +// See the GNU Lesser General Public License for more details. +// +// To view the GNU Lesser General Public License visit +// http://www.gnu.org/copyleft/lesser.html +// or write to the Free Software Foundation, Inc., +// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +#ifndef __MEM_USAGE__ +#define __MEM_USAGE__ + extern int mem_usage(double& vm_usage, double& resident_set); + +#endif +