[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdenonbeta/icecream/icecream/daemon
From:       David Faure <faure () kde ! org>
Date:       2005-03-02 0:44:27
Message-ID: 20050302004427.E409817A01 () office ! kde ! org
[Download RAW message or body]

CVS commit by faure: 

Compilation fixes on Mac OSX, but now I hit the /proc error message - is getting
the load of the machine really necessary? :/


  M +2 -2      load.cpp   1.17
  M +1 -0      main.cpp   1.112
  M +2 -0      workit.cpp   1.35


--- kdenonbeta/icecream/icecream/daemon/load.cpp  #1.16:1.17
@@ -182,5 +182,5 @@ bool fill_stats( unsigned long &mynicelo
         log_error() << "Cannot open file \'/proc/stat\'!\n"
             "The kernel needs to be compiled with support\n"
-            "forks /proc filesystem enabled!" << endl;
+            "for /proc filesystem enabled!" << endl;
         return false;
     }
@@ -209,5 +209,5 @@ bool fill_stats( unsigned long &mynicelo
             log_error() << "Cannot open file \'/proc/meminfo\'!\n"
                 "The kernel needs to be compiled with support\n"
-                "forks /proc filesystem enabled!" << endl;
+                "for /proc filesystem enabled!" << endl;
             return false;
         }

--- kdenonbeta/icecream/icecream/daemon/main.cpp  #1.111:1.112
@@ -42,4 +42,5 @@
 #include <sys/socket.h>
 #include <sys/time.h>
+#include <sys/resource.h>
 #include <pwd.h>
 

--- kdenonbeta/icecream/icecream/daemon/workit.cpp  #1.34:1.35
@@ -176,4 +176,5 @@ int work_it( CompileJob &j,
         setenv( "LD_LIBRARY_PATH", "usr/lib:lib", 1 );
 
+#ifdef RLIMIT_AS
         struct rlimit rlim;
         if ( getrlimit( RLIMIT_AS, &rlim ) )
@@ -184,4 +185,5 @@ int work_it( CompileJob &j,
         if ( setrlimit( RLIMIT_AS, &rlim ) )
             log_perror( "setrlimit" );
+#endif
 
         int argc = list.size();


[prev in list] [next in list] [prev in thread] [next in thread]