- code shuffling

svn path=/trunk/boinc/; revision=18826

sched/Makefile.am

@@ -128,7 +128,7 @@ noinst_HEADERS = \
     sched_send.h \
     sched_shmem.h \
     sched_version.h \
-    server_types.h
+    sched_types.h
 
 EXTRA_DIST = \
     start
@@ -151,7 +151,7 @@ cgi_sources = \
     sched_send.cpp \
     sched_timezone.cpp \
     sched_version.cpp \
-    server_types.cpp \
+    sched_types.cpp \
     time_stats_log.cpp
 
 cgi_SOURCES = $(cgi_sources)

sched/handle_request.h

@@ -17,9 +17,6 @@
 
 #include <cstdio>
 
-#include "sched_shmem.h"
-#include "server_types.h"
-
 extern void handle_request(
     FILE* fin, FILE* fout, char* code_sign_key
 );

sched/sched_customize.h

@@ -16,7 +16,7 @@
 // along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "boinc_db.h"
-#include "server_types.h"
+#include "sched_types.h"
 
 // reasons for the planning function to reject a host
 

sched/sched_main.h

@@ -18,7 +18,7 @@
 #include "boinc_db.h"
 #include "sched_config.h"
 #include "synch.h"
-#include "server_types.h"
+#include "sched_types.h"
 #include "sched_shmem.h"
 
 // various delay params.

sched/sched_send.h

@@ -21,7 +21,7 @@
 #include <string.h>
 
 #include "boinc_db.h"
-#include "server_types.h"
+#include "sched_types.h"
 
 extern void send_work();
 

sched/sched_types.cpp

@@ -26,11 +26,12 @@
 #include "error_numbers.h"
 #include "str_util.h"
 #include "util.h"
+
 #include "sched_main.h"
 #include "sched_util.h"
 #include "sched_msgs.h"
 #include "time_stats_log.h"
-#include "server_types.h"
+#include "sched_types.h"
 
 #ifdef _USING_FCGI_
 #include "boinc_fcgi.h"

sched/time_stats_log.cpp

@@ -23,6 +23,7 @@
 
 #include "sched_msgs.h"
 #include "sched_config.h"
+#include "sched_types.h"
 
 #include "time_stats_log.h"
 

sched/time_stats_log.h

@@ -16,7 +16,6 @@
 // along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <cstdio>
-#include "server_types.h"
 
 extern void handle_time_stats_log(FILE* fin);
 extern void write_time_stats_log();