From 6c904f7bcb1ac4cc4a0481a6cfb83fce0e0bb795 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Fri, 5 Nov 2004 19:52:19 +0000
Subject: [PATCH] *** empty log message ***

svn path=/trunk/boinc/; revision=4492
---
 api/boinc_api.h    |  1 -
 checkin_notes      | 14 +++++++++++++-
 client/dhrystone.C |  2 +-
 client/whetstone.C |  2 +-
 lib/util.h         |  2 ++
 5 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/api/boinc_api.h b/api/boinc_api.h
index e64916e19f..a8d0918fb5 100755
--- a/api/boinc_api.h
+++ b/api/boinc_api.h
@@ -76,7 +76,6 @@ extern "C" {
     extern int boinc_fraction_done(double);
 
     extern int boinc_wu_cpu_time(double&);
-    extern int boinc_calling_thread_cpu_time(double&, double&);
 
     extern int boinc_suspend_other_activities();
     extern int boinc_resume_other_activities();
diff --git a/checkin_notes b/checkin_notes
index 6c419fdcb0..8ff31b7445 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -19084,7 +19084,7 @@ David  4 Nov 2004
 	client
 		Makefile.am
 
-David  5 Nov
+David  5 Nov 2004
     - get clientgui to compile on Solaris.
         - include <stdexcept>
         - add NOCLIPBOARD flag in Makefile,
@@ -19098,3 +19098,15 @@ David  5 Nov
         stdwx.h
     lib/
         util.C
+
+David  5 Nov 2004
+    - move declaration of boinc_calling_thread_cpu_time()
+        from boinc_api.h to util.h
+
+    api/
+        boinc_api.h
+    client/
+        dhrystone.C
+        whetstone.C
+    lib/
+        util.h
diff --git a/client/dhrystone.C b/client/dhrystone.C
index d411d9d086..661eef7362 100644
--- a/client/dhrystone.C
+++ b/client/dhrystone.C
@@ -44,7 +44,7 @@
 #include <cstdio>
 #include <cstring>
 
-#include "boinc_api.h"
+#include "util.h"
 #include "cpu_benchmark.h"
 #include "dhrystone.h"
 
diff --git a/client/whetstone.C b/client/whetstone.C
index 473c742143..2264580a99 100644
--- a/client/whetstone.C
+++ b/client/whetstone.C
@@ -32,7 +32,7 @@
 #include <ctime>
 #endif
 
-#include "boinc_api.h"
+#include "util.h"
 #include "cpu_benchmark.h"
 
 #define SPDP double
diff --git a/lib/util.h b/lib/util.h
index 90f3b76acd..b1640ebf17 100755
--- a/lib/util.h
+++ b/lib/util.h
@@ -126,4 +126,6 @@ extern int dir_hier_url(
     const char* filename, const char* root, int fanout, char* result
 );
 
+extern int boinc_calling_thread_cpu_time(double&, double&);
+
 #endif