From f7f80d99004d73ac24aa867b824238e3406106af Mon Sep 17 00:00:00 2001
From: Eric Heien <eric@heien.org>
Date: Thu, 6 Jun 2002 22:39:21 +0000
Subject: [PATCH] Fixed compile bug on solaris.

svn path=/trunk/boinc/; revision=93
---
 client/hostinfo_unix.C | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/client/hostinfo_unix.C b/client/hostinfo_unix.C
index d78b62db15..bca12fa84e 100644
--- a/client/hostinfo_unix.C
+++ b/client/hostinfo_unix.C
@@ -21,9 +21,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#if HAVE_SYS_SYSTEMINFO_H
-#include <sys/systeminfo.h>
-#endif
 #include <sys/types.h>
 #if HAVE_SYS_STATVFS_H
 #include <sys/statvfs.h>
@@ -35,6 +32,7 @@
 #ifdef _WIN32
 #include <windows.h>
 #else
+#include <sys/systeminfo.h>
 #include <sys/utsname.h>
 #include <unistd.h>
 #include <netdb.h>
@@ -166,8 +164,8 @@ void get_osinfo(HOST_INFO& host) {
 
 #endif
 
-#ifdef solaris
 int get_host_info(HOST_INFO& host) {
+#ifdef solaris
     struct statvfs foo;
 
     memset(&host, 0, sizeof(host));
@@ -198,19 +196,9 @@ int get_host_info(HOST_INFO& host) {
     for (i=0; i<n; i++) {
         host.m_swap += 512.*(double)s->swt_ent[i].ste_length;
     }
-
-    return 0;
-}
-#endif
-
-#ifdef mac
-int get_host_info(HOST_INFO &host) {
-    return 0;
-}
 #endif
 
 #ifdef linux
-int get_host_info(HOST_INFO& host) {
     memset(&host, 0, sizeof(host));
       
     get_local_domain_name(host.domain_name);
@@ -220,7 +208,9 @@ int get_host_info(HOST_INFO& host) {
     parse_meminfo(host);
     get_osinfo(host);
     get_timezone(host.timezone);
+#endif
 
     return 0;
 }
-#endif
+
+