From f3f11e7b81d871fa40132a34d69aa9d6481d4e54 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Tue, 17 Apr 2007 18:55:20 +0000
Subject: [PATCH] svn path=/trunk/boinc/; revision=12403

---
 checkin_notes            | 6 ++++++
 doc/backend_programs.php | 2 +-
 doc/create_project.php   | 6 +++++-
 doc/files.php            | 2 +-
 doc/groups.php           | 2 +-
 lib/util.C               | 2 ++
 6 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 4dd6110b8a..173f3b412a 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -3642,3 +3642,9 @@ David  17 Apr 2007
     sched/
         sched_config.C,h
         file_deleter.C
+
+David  17 Apr 2007
+    - compile fix for FCGI
+
+    lib/
+        util.C
diff --git a/doc/backend_programs.php b/doc/backend_programs.php
index d6b9c3c707..12fa5c5385 100644
--- a/doc/backend_programs.php
+++ b/doc/backend_programs.php
@@ -120,7 +120,7 @@ record results in a database and perhaps generating more work.
 
 <h3>File deletion</h3>
 The application-independent program
-<a href=file_deleter.php>file_deleter</a>
+<a href=trac/wiki/FileDeleter>file_deleter</a>
 deletes input and output files when they are no longer needed.
 
 <h3>Database purging</h3>
diff --git a/doc/create_project.php b/doc/create_project.php
index f29f89e087..fe83e39d81 100644
--- a/doc/create_project.php
+++ b/doc/create_project.php
@@ -176,7 +176,11 @@ chapter("backend_programs.php", "Work-handling daemons");
 chapter("tools_work.php", "Generating work");
 chapter("validate.php", "Result validation");
 chapter("assimilate.php", "Result assimilation");
-chapter("file_deleter.php", "Server-side file deletion");
+if ($book) {
+    chapter("file_deleter.php", "Server-side file deletion");
+} else {
+    chapter("trac/wiki/FileDeleter", "Server-side file deletion");
+}
 chapter("db_purge.php", "Database purging utility");
 echo "
 </ul>
diff --git a/doc/files.php b/doc/files.php
index 9c43388482..a8f921bb17 100644
--- a/doc/files.php
+++ b/doc/files.php
@@ -77,7 +77,7 @@ The file may deleted by an explicit
 <a href=delete_file.php>server request</a>.
 The file may also be deleted at any time by the core client
 in order to honor limits on disk-space usage.
-<li> On the server, the <a href=file_deleter.php>file deleter daemon</a>
+<li> On the server, the <a href=trac/wiki/FileDeleter>file deleter daemon</a>
 deletes input and output files that are no longer needed.
 This can be suppressed using the 'no_delete' flag,
 or using command-line options to the file deleter.
diff --git a/doc/groups.php b/doc/groups.php
index bc0ef59d28..f9d2420871 100644
--- a/doc/groups.php
+++ b/doc/groups.php
@@ -17,7 +17,7 @@ This causes problems:
 for example, when the file upload handler creates a
 directory in the <a href=hier_dir.php>upload hierarchy</a>,
 it's owned by (apache, apache),
-and the <a href=file_deleter.php>file deleter</a>
+and the <a href=trac/wiki/FileDeleter>file deleter</a>
 (which runs as boincadm)
 won't be able to delete the files there.
 
diff --git a/lib/util.C b/lib/util.C
index c9cf83a5af..a4d74cb5f3 100755
--- a/lib/util.C
+++ b/lib/util.C
@@ -546,6 +546,7 @@ int wait_client_mutex(const char* dir, double timeout) {
     return ERR_ALREADY_RUNNING;
 }
 
+#ifndef _USING_FCGI_
 #ifndef _WIN32
 // (linux) return current CPU time of the given process
 //
@@ -564,5 +565,6 @@ double linux_cpu_time(int pid) {
     return (double)(utime + stime)/100;
 }
 #endif
+#endif
 
 const char *BOINC_RCSID_ab65c90e1e = "$Id$";