From d9ee4260715b3ad364c2011318446cefa58a3a1c Mon Sep 17 00:00:00 2001 From: "Eric J. Korpela" Date: Mon, 21 Nov 2005 18:34:44 +0000 Subject: [PATCH] Added explicit includes of "config.h" in many files to enable use of compilers without a -include command line option. svn path=/trunk/boinc/; revision=8896 --- Makefile.incl | 3 +-- api/api_app.C | 2 ++ api/api_test.C | 2 ++ api/bmplib.C | 2 ++ api/boinc_api.C | 1 + api/boinc_api_fortran.C | 1 + api/boinc_checkpoint.C | 1 + api/graphics_api.C | 2 ++ api/graphics_data.C | 1 + api/graphics_impl_lib.C | 1 + api/graphics_lib.C | 1 + api/gutil.C | 2 ++ api/make_app_icon_h.C | 1 + api/reduce_lib.C | 2 ++ api/reduce_main.C | 2 ++ api/static_graphics.C | 2 ++ api/texture.C | 1 + api/tgalib.C | 2 +- api/windows_opengl.C | 2 ++ api/x_opengl.C | 1 + apps/1sec.C | 1 + apps/concat.C | 2 +- apps/error.C | 2 +- apps/upper_case.C | 2 ++ client/acct_mgr.C | 1 + client/acct_setup.C | 1 + client/app.C | 2 ++ client/app_control.C | 10 ++++++++-- client/app_graphics.C | 2 ++ client/app_start.C | 1 + client/check_state.C | 2 ++ client/client_msgs.C | 4 ++-- client/client_state.C | 1 + client/client_types.C | 1 + client/cs_account.C | 1 + client/cs_apps.C | 1 + client/cs_benchmark.C | 1 + client/cs_cmdline.C | 1 + client/cs_data.C | 1 + client/cs_files.C | 1 + client/cs_prefs.C | 1 + client/cs_scheduler.C | 1 + client/cs_statefile.C | 2 ++ client/cs_trickle.C | 2 ++ client/dhrystone.C | 2 ++ client/file_names.C | 1 + client/file_xfer.C | 2 ++ client/gui_http.C | 2 +- client/gui_rpc_server.C | 1 + client/gui_rpc_server_ops.C | 1 + client/gui_titles.C | 2 +- client/hostinfo_network.C | 1 + client/hostinfo_unix.C | 2 ++ client/http.C | 1 + client/http_curl.C | 1 + client/log_flags.C | 1 + client/net_stats.C | 1 + client/net_xfer.C | 1 + client/net_xfer_curl.C | 1 + client/pers_file_xfer.C | 1 + client/proxy.C | 1 + client/scheduler_op.C | 1 + client/ss_logic.C | 2 ++ client/ssl_http.C | 1 + client/ssl_net_xfer.C | 1 + client/test_file_xfer.C | 1 + client/test_http.C | 2 ++ client/test_net_xfer.C | 2 ++ client/time_stats.C | 1 + client/whetstone.C | 1 + db/boinc_db.C | 1 + db/db_base.C | 1 + lib/Makefile.am | 1 - lib/app_ipc.C | 1 + lib/base64.C | 1 + lib/boinc_cmd.C | 1 + lib/crypt.C | 1 + lib/crypt_prog.C | 1 + lib/diagnostics.C | 1 + lib/exception.C | 1 + lib/filesys.C | 1 + lib/gui_rpc_client.C | 4 ++-- lib/hostinfo.C | 1 + lib/language.C | 1 + lib/md5_file.C | 1 + lib/mem_usage.C | 1 + lib/mfile.C | 1 + lib/miofile.C | 1 + lib/msg_log.C | 1 + lib/msg_queue.C | 1 + lib/msg_test.C | 1 + lib/network.C | 1 + lib/parse.C | 1 + lib/prefs.C | 1 + lib/proxy_info.C | 1 + lib/shmem.C | 1 + lib/shmem_test.C | 1 + lib/susp.C | 1 + lib/synch.C | 1 + lib/synch_test.C | 1 + lib/util.C | 1 + m4/boinc_msg_debug.m4 | 4 ++++ sched/assimilator.C | 1 + sched/assimilator_placeholder.C | 2 +- sched/db_dump.C | 1 + sched/db_purge.C | 2 ++ sched/delete_file.C | 1 + sched/feeder.C | 1 + sched/file_deleter.C | 1 + sched/file_upload_handler.C | 1 + sched/get_file.C | 3 ++- sched/handle_request.C | 1 + sched/main.C | 1 + sched/make_work.C | 1 + sched/message_handler.C | 1 + sched/request_file_list.C | 1 + sched/sample_bitwise_validator.C | 1 + sched/sample_dummy_assimilator.C | 1 + sched/sample_trivial_validator.C | 1 + sched/sched_array.C | 1 + sched/sched_config.h | 1 + sched/sched_hr.C | 1 + sched/sched_locality.C | 1 + sched/sched_msgs.C | 1 + sched/sched_resend.C | 1 + sched/sched_send.C | 1 + sched/sched_shmem.C | 1 + sched/sched_timezone.C | 1 + sched/sched_util.C | 1 + sched/send_file.C | 4 ++-- sched/server_types.C | 2 +- sched/show_shmem.C | 2 +- sched/transitioner.C | 2 +- sched/trickle_handler.C | 2 +- sched/update_stats.C | 2 +- sched/validate_util.C | 1 + sched/validator.C | 1 + sched/validator_placeholder.C | 1 + sched/wu_check.C | 1 + sea/make-tar.sh | 2 +- sea/make-tar_debug.sh | 2 +- tools/backend_lib.C | 1 + tools/create_work.C | 1 + tools/dir_hier_move.C | 1 + tools/dir_hier_path.C | 1 + tools/hr_db_convert.C | 1 + tools/kill_wu.C | 1 + tools/poll_wu.C | 1 + tools/process_result_template.C | 1 + tools/sign_executable.C | 1 + 150 files changed, 185 insertions(+), 25 deletions(-) create mode 100644 m4/boinc_msg_debug.m4 diff --git a/Makefile.incl b/Makefile.incl index 212af22688..1a5d2a3a3f 100644 --- a/Makefile.incl +++ b/Makefile.incl @@ -21,8 +21,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/tools \ -I$(top_srcdir)/sched \ $(MYSQL_CFLAGS) \ - $(PTHREAD_CFLAGS) \ - -include $(top_srcdir)/config.h + $(PTHREAD_CFLAGS) AM_CFLAGS = $(AM_CPPFLAGS) AM_CXXFLAGS = $(AM_CPPFLAGS) diff --git a/api/api_app.C b/api/api_app.C index 89208a0714..13315e4712 100644 --- a/api/api_app.C +++ b/api/api_app.C @@ -19,6 +19,8 @@ // test program for MFILE class +#include "config.h" + #include #ifdef HAVE_SYS_TIME_H #include diff --git a/api/api_test.C b/api/api_test.C index 7dcc77c553..140945ddaa 100644 --- a/api/api_test.C +++ b/api/api_test.C @@ -17,6 +17,8 @@ // or write to the Free Software Foundation, Inc., // 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +#include "config.h" + #include #include diff --git a/api/bmplib.C b/api/bmplib.C index c07e7d556a..8ed31d12d1 100644 --- a/api/bmplib.C +++ b/api/bmplib.C @@ -1,5 +1,7 @@ #ifdef _WIN32 #include "boinc_win.h" +#else +#include "config.h" #endif #include "bmplib.h" diff --git a/api/boinc_api.C b/api/boinc_api.C index 194f70f803..ff65c93849 100644 --- a/api/boinc_api.C +++ b/api/boinc_api.C @@ -657,6 +657,7 @@ void* timer_thread(void*) { boinc_sleep(TIMER_PERIOD); worker_timer(0); } + return 0; } void worker_signal_handler(int) { diff --git a/api/boinc_api_fortran.C b/api/boinc_api_fortran.C index 73262f7e4f..e298f91495 100644 --- a/api/boinc_api_fortran.C +++ b/api/boinc_api_fortran.C @@ -22,6 +22,7 @@ // Define this symbol (here or in Makefile) if you want graphics functions //#define GRAPHICS +#include "config.h" #include "util.h" #include "boinc_api.h" #ifdef GRAPHICS diff --git a/api/boinc_checkpoint.C b/api/boinc_checkpoint.C index c8d48f611a..ae8e7cc562 100644 --- a/api/boinc_checkpoint.C +++ b/api/boinc_checkpoint.C @@ -19,6 +19,7 @@ // Untested and unsupported code for checkpointing multiple files. +#include "config.h" #include #include #include diff --git a/api/graphics_api.C b/api/graphics_api.C index 40f7468f1c..61f2523d18 100755 --- a/api/graphics_api.C +++ b/api/graphics_api.C @@ -19,6 +19,8 @@ #if defined(_WIN32) && !defined(__STDWX_H__) && !defined(_BOINC_WIN_) && !defined(_AFX_STDAFX_H_) #include "boinc_win.h" +#else +#include "config.h" #endif #include "boinc_api.h" diff --git a/api/graphics_data.C b/api/graphics_data.C index 4afed7f111..0f4343725d 100644 --- a/api/graphics_data.C +++ b/api/graphics_data.C @@ -17,6 +17,7 @@ // or write to the Free Software Foundation, Inc., // 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +#include "config.h" #include "graphics_data.h" void GRAPHICS_BUFFER::clear() { diff --git a/api/graphics_impl_lib.C b/api/graphics_impl_lib.C index 20dae38683..b5f047d51e 100644 --- a/api/graphics_impl_lib.C +++ b/api/graphics_impl_lib.C @@ -20,6 +20,7 @@ // Code that is included in the shared-library part of a graphics app, // but NOT in libboinc_graphics_api.a (used by monolithic apps) +#include "config.h" #include "app_ipc.h" #include "graphics_impl.h" diff --git a/api/graphics_lib.C b/api/graphics_lib.C index 5e34f98577..d02b7cb857 100644 --- a/api/graphics_lib.C +++ b/api/graphics_lib.C @@ -22,6 +22,7 @@ // This lets you make applications that work whether or not // the host has X11 and OpenGL libraries. +#include "config.h" #include #include "boinc_api.h" diff --git a/api/gutil.C b/api/gutil.C index afdc58ddc6..39ef62880a 100755 --- a/api/gutil.C +++ b/api/gutil.C @@ -19,6 +19,8 @@ #if defined(_WIN32) && !defined(__STDWX_H__) && !defined(_BOINC_WIN_) && !defined(_AFX_STDAFX_H_) #include "boinc_win.h" +#else +#include "config.h" #endif #ifdef _WIN32 diff --git a/api/make_app_icon_h.C b/api/make_app_icon_h.C index 43d5e61de7..f45cdb5e3e 100644 --- a/api/make_app_icon_h.C +++ b/api/make_app_icon_h.C @@ -21,6 +21,7 @@ // Utility to convert *.icns file into app_icon.h file for use // with api/setMacIcon() in science applications. +#include "config.h" #include int main(int argc, char** argv) { diff --git a/api/reduce_lib.C b/api/reduce_lib.C index c1a5929b1c..4bf24d187e 100644 --- a/api/reduce_lib.C +++ b/api/reduce_lib.C @@ -21,6 +21,8 @@ #if defined(_WIN32) && !defined(__STDWX_H__) && !defined(_BOINC_WIN_) && !defined(_AFX_STDAFX_H_) #include "boinc_win.h" +#else +#include "config.h" #endif #ifdef _WIN32 diff --git a/api/reduce_main.C b/api/reduce_main.C index df87dfb006..4baa6332c9 100644 --- a/api/reduce_main.C +++ b/api/reduce_main.C @@ -18,6 +18,8 @@ #if defined(_WIN32) && !defined(__STDWX_H__) && !defined(_BOINC_WIN_) && !defined(_AFX_STDAFX_H_) #include "boinc_win.h" +#else +#include "config.h" #endif #ifdef _WIN32 diff --git a/api/static_graphics.C b/api/static_graphics.C index a0ff8b1d6f..367635acdd 100644 --- a/api/static_graphics.C +++ b/api/static_graphics.C @@ -25,6 +25,8 @@ #ifdef _WIN32 #include "boinc_win.h" +#else +#include "config.h" #endif #include "boinc_gl.h" diff --git a/api/texture.C b/api/texture.C index d2e1178ca1..57e396dc60 100644 --- a/api/texture.C +++ b/api/texture.C @@ -1,3 +1,4 @@ +#include "config.h" #include #include #include diff --git a/api/tgalib.C b/api/tgalib.C index d03be5d20b..d68b66375c 100644 --- a/api/tgalib.C +++ b/api/tgalib.C @@ -1,4 +1,4 @@ - +#include "config.h" #include "tgalib.h" diff --git a/api/windows_opengl.C b/api/windows_opengl.C index df00141699..3205afaadb 100755 --- a/api/windows_opengl.C +++ b/api/windows_opengl.C @@ -12,6 +12,8 @@ */ #if defined(_WIN32) && !defined(__STDWX_H__) && !defined(_BOINC_WIN_) && !defined(_AFX_STDAFX_H_) #include "boinc_win.h" +#else +#include "config.h" #endif diff --git a/api/x_opengl.C b/api/x_opengl.C index c166282813..0ee1df9b99 100644 --- a/api/x_opengl.C +++ b/api/x_opengl.C @@ -17,6 +17,7 @@ // or write to the Free Software Foundation, Inc., // 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +#include "config.h" #include #include #include diff --git a/apps/1sec.C b/apps/1sec.C index f2e336e2d0..2fd7f2d14e 100644 --- a/apps/1sec.C +++ b/apps/1sec.C @@ -19,6 +19,7 @@ // burn up to one CPU second +#include "config.h" #include #include diff --git a/apps/concat.C b/apps/concat.C index 3cdf54f125..0a3418718e 100644 --- a/apps/concat.C +++ b/apps/concat.C @@ -20,7 +20,7 @@ // concat [-run_slow] file1 ... filen outfile // // concatenate files, write to outfile - +#include "config.h" #include #include #include diff --git a/apps/error.C b/apps/error.C index ada8963052..18b69706d2 100644 --- a/apps/error.C +++ b/apps/error.C @@ -18,7 +18,7 @@ // 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // crash and burn - +#include "config.h" #include #include diff --git a/apps/upper_case.C b/apps/upper_case.C index f077b5003d..e3666f42ec 100755 --- a/apps/upper_case.C +++ b/apps/upper_case.C @@ -27,6 +27,8 @@ #ifdef _WIN32 #include "boinc_win.h" +#else +#include "config.h" #endif #ifndef _WIN32 diff --git a/client/acct_mgr.C b/client/acct_mgr.C index c9aeed5ade..0ceac0246e 100644 --- a/client/acct_mgr.C +++ b/client/acct_mgr.C @@ -20,6 +20,7 @@ #ifdef _WIN32 #include "boinc_win.h" #endif +#include "config.h" #include "parse.h" #include "error_numbers.h" #include "client_msgs.h" diff --git a/client/acct_setup.C b/client/acct_setup.C index 03e99dbe4c..a1dfdbe53a 100644 --- a/client/acct_setup.C +++ b/client/acct_setup.C @@ -17,6 +17,7 @@ // or write to the Free Software Foundation, Inc., // 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +#include "config.h" #include "client_state.h" #include "file_names.h" #include "parse.h" diff --git a/client/app.C b/client/app.C index 0a3acf360c..9e388df0ad 100644 --- a/client/app.C +++ b/client/app.C @@ -25,6 +25,8 @@ #ifdef _WIN32 #include "boinc_win.h" +#else +#include "config.h" #endif #ifndef _WIN32 diff --git a/client/app_control.C b/client/app_control.C index 33553621ed..63a20472d3 100644 --- a/client/app_control.C +++ b/client/app_control.C @@ -24,9 +24,11 @@ #ifdef _WIN32 #include "boinc_win.h" #else +#include "config.h" +#ifdef HAVE_UNISTD_H #include -#include +#endif #if HAVE_SYS_IPC_H #include @@ -34,8 +36,12 @@ #if HAVE_SYS_RESOURCE_H #include #endif -#if HAVE_SYS_SIGNAL_H +#ifdef HAVE_CSIGNAL +#include +#elif defined(HAVE_SYS_SIGNAL_H) #include +#elif defined(HAVE_SIGNAL_H) +#include #endif #if HAVE_SYS_WAIT_H #include diff --git a/client/app_graphics.C b/client/app_graphics.C index bbe4a761a0..ff8811445a 100644 --- a/client/app_graphics.C +++ b/client/app_graphics.C @@ -23,6 +23,8 @@ #ifdef _WIN32 #include "boinc_win.h" +#else +#include "config.h" #endif #include "exception.h" diff --git a/client/app_start.C b/client/app_start.C index 0550e44f56..f2b3747d5c 100644 --- a/client/app_start.C +++ b/client/app_start.C @@ -24,6 +24,7 @@ #ifdef _WIN32 #include "boinc_win.h" #else +#include "config.h" #if HAVE_SYS_TIME_H #include #endif diff --git a/client/check_state.C b/client/check_state.C index 0b62a90e04..439e465ca3 100644 --- a/client/check_state.C +++ b/client/check_state.C @@ -24,6 +24,8 @@ #ifdef _WIN32 #include "boinc_win.h" +#else +#include "config.h" #endif #ifndef _WIN32 diff --git a/client/client_msgs.C b/client/client_msgs.C index 980beaf98c..4e31ed6fce 100644 --- a/client/client_msgs.C +++ b/client/client_msgs.C @@ -19,8 +19,8 @@ #ifdef _WIN32 #include "boinc_win.h" -#endif -#ifndef _WIN32 +#else +#include "config.h" #include #include #endif diff --git a/client/client_state.C b/client/client_state.C index afb273bf12..51d27571d1 100644 --- a/client/client_state.C +++ b/client/client_state.C @@ -24,6 +24,7 @@ #endif #ifndef _WIN32 +#include "config.h" #if HAVE_SYS_TYPES_H #include #endif diff --git a/client/client_types.C b/client/client_types.C index 76f2cd4035..cb693f557c 100644 --- a/client/client_types.C +++ b/client/client_types.C @@ -24,6 +24,7 @@ #endif #ifndef _WIN32 +#include "config.h" #include #include #endif diff --git a/client/cs_account.C b/client/cs_account.C index ab74833a74..07212e7a2f 100644 --- a/client/cs_account.C +++ b/client/cs_account.C @@ -22,6 +22,7 @@ #endif #ifndef _WIN32 +#include "config.h" #include #include #ifdef HAVE_SYS_STAT_H diff --git a/client/cs_apps.C b/client/cs_apps.C index fd987af3f8..6a9bb60461 100644 --- a/client/cs_apps.C +++ b/client/cs_apps.C @@ -28,6 +28,7 @@ #endif #ifndef _WIN32 +#include "config.h" #include #include #endif diff --git a/client/cs_benchmark.C b/client/cs_benchmark.C index 43d074450f..242cd3004b 100644 --- a/client/cs_benchmark.C +++ b/client/cs_benchmark.C @@ -37,6 +37,7 @@ #endif #ifndef _WIN32 +#include "config.h" #if HAVE_SYS_TYPES_H #include #endif diff --git a/client/cs_cmdline.C b/client/cs_cmdline.C index c89f7e8e6b..ca13a61df5 100644 --- a/client/cs_cmdline.C +++ b/client/cs_cmdline.C @@ -22,6 +22,7 @@ #ifdef _WIN32 #include "boinc_win.h" #else +#include "config.h" #include #include #endif diff --git a/client/cs_data.C b/client/cs_data.C index 9aef2aa0a4..a53c04d416 100644 --- a/client/cs_data.C +++ b/client/cs_data.C @@ -31,6 +31,7 @@ #endif #ifndef _WIN32 +#include "config.h" #include #include #endif diff --git a/client/cs_files.C b/client/cs_files.C index be5ad0de83..1402e034d2 100644 --- a/client/cs_files.C +++ b/client/cs_files.C @@ -28,6 +28,7 @@ #endif #ifndef _WIN32 +#include "config.h" #include #include #include diff --git a/client/cs_prefs.C b/client/cs_prefs.C index 4708894e26..8014ed4ce7 100644 --- a/client/cs_prefs.C +++ b/client/cs_prefs.C @@ -26,6 +26,7 @@ #endif #ifndef _WIN32 +#include "config.h" #if HAVE_SYS_STAT_H #include #endif diff --git a/client/cs_scheduler.C b/client/cs_scheduler.C index ad8a4ab1cb..ceeed7d08b 100644 --- a/client/cs_scheduler.C +++ b/client/cs_scheduler.C @@ -29,6 +29,7 @@ #endif #ifndef _WIN32 +#include "config.h" #include #include #include diff --git a/client/cs_statefile.C b/client/cs_statefile.C index ae6e49af89..38eda199d9 100644 --- a/client/cs_statefile.C +++ b/client/cs_statefile.C @@ -19,6 +19,8 @@ #ifdef _WIN32 #include "boinc_win.h" +#else +#include "config.h" #endif #include "parse.h" diff --git a/client/cs_trickle.C b/client/cs_trickle.C index e21c3b1a68..bce540b756 100644 --- a/client/cs_trickle.C +++ b/client/cs_trickle.C @@ -20,6 +20,8 @@ #include "cpp.h" #ifdef _WIN32 #include "boinc_win.h" +#else +#include "config.h" #endif #include "error_numbers.h" diff --git a/client/dhrystone.C b/client/dhrystone.C index 56be2abb57..20414a15b9 100644 --- a/client/dhrystone.C +++ b/client/dhrystone.C @@ -38,6 +38,8 @@ #ifdef _WIN32 #include "boinc_win.h" +#else +#include "config.h" #endif #include diff --git a/client/file_names.C b/client/file_names.C index 6638cad13e..a573a9cfb5 100644 --- a/client/file_names.C +++ b/client/file_names.C @@ -25,6 +25,7 @@ #endif #ifndef _WIN32 +#include "config.h" #include #include #include diff --git a/client/file_xfer.C b/client/file_xfer.C index a8c069c0f7..613bcff58e 100644 --- a/client/file_xfer.C +++ b/client/file_xfer.C @@ -21,6 +21,8 @@ #ifdef _WIN32 #include "boinc_win.h" +#else +#include "config.h" #endif #include "util.h" diff --git a/client/gui_http.C b/client/gui_http.C index 0711ddf1a8..c41676f2b9 100644 --- a/client/gui_http.C +++ b/client/gui_http.C @@ -16,7 +16,7 @@ // http://www.gnu.org/copyleft/lesser.html // or write to the Free Software Foundation, Inc., // 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - +#include "config.h" #include "client_state.h" #include "filesys.h" #include "error_numbers.h" diff --git a/client/gui_rpc_server.C b/client/gui_rpc_server.C index c2cc507485..fdf2c2f804 100644 --- a/client/gui_rpc_server.C +++ b/client/gui_rpc_server.C @@ -25,6 +25,7 @@ #endif #ifndef _WIN32 +#include "config.h" #include #include #include diff --git a/client/gui_rpc_server_ops.C b/client/gui_rpc_server_ops.C index 127d63712c..8c7461c419 100644 --- a/client/gui_rpc_server_ops.C +++ b/client/gui_rpc_server_ops.C @@ -24,6 +24,7 @@ #endif #ifndef _WIN32 +#include "config.h" #include #include #include diff --git a/client/gui_titles.C b/client/gui_titles.C index d2fc58b763..83a2ce1d05 100644 --- a/client/gui_titles.C +++ b/client/gui_titles.C @@ -16,7 +16,7 @@ // http://www.gnu.org/copyleft/lesser.html // or write to the Free Software Foundation, Inc., // 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - +#include "config.h" #include "gui_titles.h" // TODO: the code is riddled with constants that are indices diff --git a/client/hostinfo_network.C b/client/hostinfo_network.C index d00e11e3ff..e42ac4462e 100644 --- a/client/hostinfo_network.C +++ b/client/hostinfo_network.C @@ -22,6 +22,7 @@ #endif #ifndef _WIN32 +#include "config.h" #include #include diff --git a/client/hostinfo_unix.C b/client/hostinfo_unix.C index 307b2dcc3f..2c5729393e 100644 --- a/client/hostinfo_unix.C +++ b/client/hostinfo_unix.C @@ -19,6 +19,8 @@ #include "cpp.h" +#include "config.h" + #include #include #include diff --git a/client/http.C b/client/http.C index 4f35e84e25..8147906a87 100644 --- a/client/http.C +++ b/client/http.C @@ -22,6 +22,7 @@ #ifdef _WIN32 #include "boinc_win.h" #else +#include "config.h" #include #include #include diff --git a/client/http_curl.C b/client/http_curl.C index 3eb1518253..1e355f5e66 100644 --- a/client/http_curl.C +++ b/client/http_curl.C @@ -22,6 +22,7 @@ #ifdef _WIN32 #include "boinc_win.h" #else +#include "config.h" #include #include #include diff --git a/client/log_flags.C b/client/log_flags.C index 3195d888e1..bdd29d45c6 100644 --- a/client/log_flags.C +++ b/client/log_flags.C @@ -24,6 +24,7 @@ #endif #ifndef _WIN32 +#include "config.h" #include #include #endif diff --git a/client/net_stats.C b/client/net_stats.C index 9a041ef651..ddd5bd32d5 100644 --- a/client/net_stats.C +++ b/client/net_stats.C @@ -31,6 +31,7 @@ #endif #ifndef _WIN32 +#include "config.h" #include #include #endif diff --git a/client/net_xfer.C b/client/net_xfer.C index 81d9437d6d..8ef9909251 100644 --- a/client/net_xfer.C +++ b/client/net_xfer.C @@ -32,6 +32,7 @@ #endif #ifndef _WIN32 +#include "config.h" #include #include #include diff --git a/client/net_xfer_curl.C b/client/net_xfer_curl.C index 993d67229d..04fe7a499e 100644 --- a/client/net_xfer_curl.C +++ b/client/net_xfer_curl.C @@ -33,6 +33,7 @@ #endif #ifndef _WIN32 +#include "config.h" #include #include #include diff --git a/client/pers_file_xfer.C b/client/pers_file_xfer.C index 65f5ea1591..8e6528dd6b 100644 --- a/client/pers_file_xfer.C +++ b/client/pers_file_xfer.C @@ -24,6 +24,7 @@ #endif #ifndef _WIN32 +#include "config.h" #include #include #endif diff --git a/client/proxy.C b/client/proxy.C index bcbb95c0f9..390f8c8d0d 100644 --- a/client/proxy.C +++ b/client/proxy.C @@ -22,6 +22,7 @@ #ifdef _WIN32 #include "boinc_win.h" #else +#include "config.h" #include #include #include diff --git a/client/scheduler_op.C b/client/scheduler_op.C index 9d4c614463..daf30a8ad6 100644 --- a/client/scheduler_op.C +++ b/client/scheduler_op.C @@ -22,6 +22,7 @@ #endif #ifndef _WIN32 +#include "config.h" #include #include #include diff --git a/client/ss_logic.C b/client/ss_logic.C index a7b673c98a..6d37eb0234 100644 --- a/client/ss_logic.C +++ b/client/ss_logic.C @@ -19,6 +19,8 @@ #ifdef _WIN32 #include "boinc_win.h" +#else +#include "config.h" #endif #include "client_state.h" diff --git a/client/ssl_http.C b/client/ssl_http.C index 25e4889687..14c6362712 100644 --- a/client/ssl_http.C +++ b/client/ssl_http.C @@ -26,6 +26,7 @@ using std::string; #endif #ifndef _WIN32 +#include "config.h" #include #include #include diff --git a/client/ssl_net_xfer.C b/client/ssl_net_xfer.C index 490ae21249..f33ab4674d 100644 --- a/client/ssl_net_xfer.C +++ b/client/ssl_net_xfer.C @@ -32,6 +32,7 @@ #endif #ifndef _WIN32 +#include "config.h" #include #include diff --git a/client/test_file_xfer.C b/client/test_file_xfer.C index 71b12bc355..2f0023405a 100644 --- a/client/test_file_xfer.C +++ b/client/test_file_xfer.C @@ -18,6 +18,7 @@ // 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "cpp.h" +#include "config.h" #include #include #include diff --git a/client/test_http.C b/client/test_http.C index e77c1d87f8..28458e98ed 100644 --- a/client/test_http.C +++ b/client/test_http.C @@ -26,6 +26,8 @@ #ifdef _WIN32 #include "winsock.h" #include "win_net.h" +#else +#include "config.h" #endif #include #if HAVE_UNISTD_H diff --git a/client/test_net_xfer.C b/client/test_net_xfer.C index 3816907812..93f19c6c95 100644 --- a/client/test_net_xfer.C +++ b/client/test_net_xfer.C @@ -27,6 +27,8 @@ #ifdef _WIN32 #include "winsock.h" #include "win_net.h" +#else +#include "config.h" #endif #if HAVE_UNISTD_H #include diff --git a/client/time_stats.C b/client/time_stats.C index f7899c2482..62eeb1957b 100644 --- a/client/time_stats.C +++ b/client/time_stats.C @@ -22,6 +22,7 @@ #endif #ifndef _WIN32 +#include "config.h" #include #include #include diff --git a/client/whetstone.C b/client/whetstone.C index 5e6e5bb069..64e382f848 100644 --- a/client/whetstone.C +++ b/client/whetstone.C @@ -25,6 +25,7 @@ #endif #ifndef _WIN32 +#include "config.h" #include #include #include diff --git a/db/boinc_db.C b/db/boinc_db.C index c462c2041b..c6840f24f4 100644 --- a/db/boinc_db.C +++ b/db/boinc_db.C @@ -17,6 +17,7 @@ // or write to the Free Software Foundation, Inc., // 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +#include "config.h" #include #include #include diff --git a/db/db_base.C b/db/db_base.C index 84ec2bccc3..d5c0a987d1 100644 --- a/db/db_base.C +++ b/db/db_base.C @@ -17,6 +17,7 @@ // or write to the Free Software Foundation, Inc., // 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +#include "config.h" #include #include #include diff --git a/lib/Makefile.am b/lib/Makefile.am index a5f4bd6d5f..961a1436bf 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -30,7 +30,6 @@ boinc_cmd_LDADD = $(lib_LIBRARIES) $(PTHREAD_LIBS) @STRIP@ $@ lib_LIBRARIES = libboinc.a - EXTRA_DIST = *.h *.C if OS_DARWIN diff --git a/lib/app_ipc.C b/lib/app_ipc.C index 2e0abeaac6..82b6255a5e 100755 --- a/lib/app_ipc.C +++ b/lib/app_ipc.C @@ -22,6 +22,7 @@ #endif #ifndef _WIN32 +#include "config.h" #include #endif diff --git a/lib/base64.C b/lib/base64.C index b091563edc..1540382491 100644 --- a/lib/base64.C +++ b/lib/base64.C @@ -21,6 +21,7 @@ #include "boinc_win.h" #endif +#include "config.h" #include "base64.h" #ifdef _USING_FCGI_ diff --git a/lib/boinc_cmd.C b/lib/boinc_cmd.C index ca074de1c5..806d1e054b 100644 --- a/lib/boinc_cmd.C +++ b/lib/boinc_cmd.C @@ -29,6 +29,7 @@ #endif #ifndef _WIN32 +#include "config.h" #include #include #endif diff --git a/lib/crypt.C b/lib/crypt.C index da25031ce0..5f40b828c9 100644 --- a/lib/crypt.C +++ b/lib/crypt.C @@ -22,6 +22,7 @@ #endif #ifndef _WIN32 +#include "config.h" #include #include #include diff --git a/lib/crypt_prog.C b/lib/crypt_prog.C index 070f0276b8..269aef1a2d 100644 --- a/lib/crypt_prog.C +++ b/lib/crypt_prog.C @@ -31,6 +31,7 @@ // -test_crypt private_keyfile public_keyfile // test encrypt/decrypt +#include "config.h" #include #include #include diff --git a/lib/diagnostics.C b/lib/diagnostics.C index 51025108f8..c9565dcc82 100644 --- a/lib/diagnostics.C +++ b/lib/diagnostics.C @@ -25,6 +25,7 @@ #endif #ifndef _WIN32 +#include "config.h" #include #include #include diff --git a/lib/exception.C b/lib/exception.C index fb83075a7a..a92db48a8a 100644 --- a/lib/exception.C +++ b/lib/exception.C @@ -22,6 +22,7 @@ #endif #ifndef _WIN32 +#include "config.h" #include "cstdio" #include "cstdlib" #include "unistd.h" diff --git a/lib/filesys.C b/lib/filesys.C index 41cdc2f342..32f771cd4a 100755 --- a/lib/filesys.C +++ b/lib/filesys.C @@ -22,6 +22,7 @@ #endif #ifndef _WIN32 +#include "config.h" #include #include #include diff --git a/lib/gui_rpc_client.C b/lib/gui_rpc_client.C index 1b5b9f7942..03dfdb41ba 100644 --- a/lib/gui_rpc_client.C +++ b/lib/gui_rpc_client.C @@ -80,7 +80,7 @@ int RPC_CLIENT::init(const char* host) { } addr.sin_addr.s_addr = *(int*)hep->h_addr_list[0]; } else { - addr.sin_addr.s_addr = inet_addr("127.0.0.1"); + addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK); } boinc_socket(sock); retval = connect(sock, (const sockaddr*)(&addr), sizeof(addr)); @@ -123,7 +123,7 @@ int RPC_CLIENT::init_asynch(const char* host, double _timeout, bool _retry) { } addr.sin_addr.s_addr = *(int*)hep->h_addr_list[0]; } else { - addr.sin_addr.s_addr = inet_addr("127.0.0.1"); + addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK); } retval = boinc_socket(sock); diff --git a/lib/hostinfo.C b/lib/hostinfo.C index 8d9d094f01..2ec1355d2b 100644 --- a/lib/hostinfo.C +++ b/lib/hostinfo.C @@ -22,6 +22,7 @@ #endif #ifndef _WIN32 +#include "config.h" #include #include diff --git a/lib/language.C b/lib/language.C index 826492ffe5..55c4ed1ced 100755 --- a/lib/language.C +++ b/lib/language.C @@ -22,6 +22,7 @@ #endif #ifndef _WIN32 +#include "config.h" #include #include #endif diff --git a/lib/md5_file.C b/lib/md5_file.C index 19c02f69f8..9ef3e71f6d 100644 --- a/lib/md5_file.C +++ b/lib/md5_file.C @@ -22,6 +22,7 @@ #endif #ifndef _WIN32 +#include "config.h" #include #endif diff --git a/lib/mem_usage.C b/lib/mem_usage.C index c004dc67a1..af0e1fb5e2 100644 --- a/lib/mem_usage.C +++ b/lib/mem_usage.C @@ -22,6 +22,7 @@ #endif #ifndef _WIN32 +#include "config.h" #include #include #include diff --git a/lib/mfile.C b/lib/mfile.C index 76849fc01d..20ed38fa19 100644 --- a/lib/mfile.C +++ b/lib/mfile.C @@ -22,6 +22,7 @@ #endif #ifndef _WIN32 +#include "config.h" #include #include #include diff --git a/lib/miofile.C b/lib/miofile.C index 77e933c383..2be55e13bd 100644 --- a/lib/miofile.C +++ b/lib/miofile.C @@ -22,6 +22,7 @@ #endif #ifndef _WIN32 +#include "config.h" #include #include #include diff --git a/lib/msg_log.C b/lib/msg_log.C index 9a6b455865..66b6dbefc7 100644 --- a/lib/msg_log.C +++ b/lib/msg_log.C @@ -22,6 +22,7 @@ #endif #ifndef _WIN32 +#include "config.h" #include #include #include diff --git a/lib/msg_queue.C b/lib/msg_queue.C index 13e444cc10..dd1705edd0 100644 --- a/lib/msg_queue.C +++ b/lib/msg_queue.C @@ -19,6 +19,7 @@ // interfaces for accessing message queues +#include "config.h" #include #include diff --git a/lib/msg_test.C b/lib/msg_test.C index 6e14364baf..9d7aebce07 100644 --- a/lib/msg_test.C +++ b/lib/msg_test.C @@ -27,6 +27,7 @@ #define KEY 0xb01fcafe +#include "config.h" #include #include diff --git a/lib/network.C b/lib/network.C index 721e282c36..53d8203c5c 100644 --- a/lib/network.C +++ b/lib/network.C @@ -22,6 +22,7 @@ #endif #ifndef _WIN32 +#include "config.h" #include #include #include diff --git a/lib/parse.C b/lib/parse.C index 44156a4f60..257abcdb87 100644 --- a/lib/parse.C +++ b/lib/parse.C @@ -29,6 +29,7 @@ #endif #ifndef _WIN32 +#include "config.h" #include #include #include diff --git a/lib/prefs.C b/lib/prefs.C index 54a053d87d..046101c103 100644 --- a/lib/prefs.C +++ b/lib/prefs.C @@ -22,6 +22,7 @@ #endif #ifndef _WIN32 +#include "config.h" #include #include #include diff --git a/lib/proxy_info.C b/lib/proxy_info.C index e26f8af60f..1729d96c61 100644 --- a/lib/proxy_info.C +++ b/lib/proxy_info.C @@ -21,6 +21,7 @@ #include "boinc_win.h" #endif +#include "config.h" #include using std::string; diff --git a/lib/shmem.C b/lib/shmem.C index 2de79633c8..feafbe2b94 100755 --- a/lib/shmem.C +++ b/lib/shmem.C @@ -24,6 +24,7 @@ #endif #ifndef _WIN32 +#include "config.h" #include #include #include diff --git a/lib/shmem_test.C b/lib/shmem_test.C index 028249e380..5c135e19f0 100644 --- a/lib/shmem_test.C +++ b/lib/shmem_test.C @@ -25,6 +25,7 @@ #define KEY 0xbeefcafe +#include "config.h" #include #include #include diff --git a/lib/susp.C b/lib/susp.C index 9dc1da67a9..6f94dbfd9a 100644 --- a/lib/susp.C +++ b/lib/susp.C @@ -19,6 +19,7 @@ * value sufficiently large that the main thread can complete its two * suspend/continue loops before any thread_routine threads terminate. */ +#include "config.h" #include #include #include diff --git a/lib/synch.C b/lib/synch.C index ca0593b770..294f8f0663 100644 --- a/lib/synch.C +++ b/lib/synch.C @@ -20,6 +20,7 @@ // interfaces for accessing sempahores +#include "config.h" #include #include diff --git a/lib/synch_test.C b/lib/synch_test.C index 20d8aa2a25..2d6dc36e10 100644 --- a/lib/synch_test.C +++ b/lib/synch_test.C @@ -21,6 +21,7 @@ // -d destroy semaphore // -l lock semaphore, sleep 10 secs, unlock +#include "config.h" #include #include "synch.h" diff --git a/lib/util.C b/lib/util.C index 78727ff1c7..86b30dca6a 100755 --- a/lib/util.C +++ b/lib/util.C @@ -26,6 +26,7 @@ #endif #ifndef _WIN32 +#include "config.h" #include #include #include diff --git a/m4/boinc_msg_debug.m4 b/m4/boinc_msg_debug.m4 new file mode 100644 index 0000000000..eb43f0c83a --- /dev/null +++ b/m4/boinc_msg_debug.m4 @@ -0,0 +1,4 @@ +# creates a message that only goes to config.log +AC_DEFUN([BOINC_MSG_DEBUG],[ + echo $1 >&5 +]) diff --git a/sched/assimilator.C b/sched/assimilator.C index 5078ade674..0b36b75f53 100644 --- a/sched/assimilator.C +++ b/sched/assimilator.C @@ -23,6 +23,7 @@ // in order to make a complete program. // +#include "config.h" #include #include #include diff --git a/sched/assimilator_placeholder.C b/sched/assimilator_placeholder.C index 2bb5409b13..d3195454c3 100644 --- a/sched/assimilator_placeholder.C +++ b/sched/assimilator_placeholder.C @@ -23,7 +23,7 @@ // replace it with your own code and then 'make' in this Directory // will build it. - +#include "config.h" #include #include "boinc_db.h" diff --git a/sched/db_dump.C b/sched/db_dump.C index 0767976f4b..e9eb62bbc1 100644 --- a/sched/db_dump.C +++ b/sched/db_dump.C @@ -40,6 +40,7 @@ // ... // +#include "config.h" #include #include #include diff --git a/sched/db_purge.C b/sched/db_purge.C index 9fa74da1ff..16376a4b99 100644 --- a/sched/db_purge.C +++ b/sched/db_purge.C @@ -53,6 +53,8 @@ // being closed. In any case the files are compressed // when db_purge exits on a signal. + +#include "config.h" #include #include #include diff --git a/sched/delete_file.C b/sched/delete_file.C index 45c0dcb211..1ac0b234e1 100644 --- a/sched/delete_file.C +++ b/sched/delete_file.C @@ -27,6 +27,7 @@ // Create a msg_to_host_that requests that the host delete the // given file from the client +#include "config.h" #include #if HAVE_UNISTD_H #include diff --git a/sched/feeder.C b/sched/feeder.C index b4ea9983b7..bea9d887fe 100644 --- a/sched/feeder.C +++ b/sched/feeder.C @@ -81,6 +81,7 @@ // configuration, or decrease the MAX_PLATFORMS, MAX_APPS // MAX_APP_VERSIONS, and MAX_WU_RESULTS in sched_shmem.h +#include "config.h" #include #include #include diff --git a/sched/file_deleter.C b/sched/file_deleter.C index 5af4a15fe2..c279842b09 100644 --- a/sched/file_deleter.C +++ b/sched/file_deleter.C @@ -20,6 +20,7 @@ // file_deleter: deletes files that are no longer needed +#include "config.h" #include #include #include diff --git a/sched/file_upload_handler.C b/sched/file_upload_handler.C index 0a3aaa483a..79c4e3f3a6 100644 --- a/sched/file_upload_handler.C +++ b/sched/file_upload_handler.C @@ -21,6 +21,7 @@ // See doc/upload.html for protocol spec. // +#include "config.h" #include #include #include diff --git a/sched/get_file.C b/sched/get_file.C index 0d777d43c9..239115b3c0 100644 --- a/sched/get_file.C +++ b/sched/get_file.C @@ -26,12 +26,13 @@ // Create a result entries, initialized to sent, and corresponding // messages to the host that is assumed to have the file. +#include "config.h" #if HAVE_UNISTD_H #include +#endif #include #include -#endif #include #include "boinc_db.h" diff --git a/sched/handle_request.C b/sched/handle_request.C index 87a1f397d8..4620e300c6 100644 --- a/sched/handle_request.C +++ b/sched/handle_request.C @@ -19,6 +19,7 @@ // Handle a scheduling server RPC +#include "config.h" #include #include #include diff --git a/sched/main.C b/sched/main.C index 863ac683a8..ff89eb8292 100644 --- a/sched/main.C +++ b/sched/main.C @@ -26,6 +26,7 @@ // Note: use_files is a debugging option (see below). // But it's a compile setting, not a cmdline flag +#include "config.h" #include #include #include diff --git a/sched/make_work.C b/sched/make_work.C index 5898a1f897..ef2fa81261 100644 --- a/sched/make_work.C +++ b/sched/make_work.C @@ -28,6 +28,7 @@ // Clones the WU of the given name. // +#include "config.h" #include #include #include diff --git a/sched/message_handler.C b/sched/message_handler.C index 697234e85b..8f020d574c 100644 --- a/sched/message_handler.C +++ b/sched/message_handler.C @@ -30,6 +30,7 @@ using namespace std; +#include "config.h" #include #include "boinc_db.h" diff --git a/sched/request_file_list.C b/sched/request_file_list.C index 665e30c1e6..d7366d7436 100644 --- a/sched/request_file_list.C +++ b/sched/request_file_list.C @@ -26,6 +26,7 @@ // Create a msg_to_host_that requests the list of permanant files // associated with the project +#include "config.h" #include #include #include diff --git a/sched/sample_bitwise_validator.C b/sched/sample_bitwise_validator.C index 8d436543c6..07810a5b6c 100644 --- a/sched/sample_bitwise_validator.C +++ b/sched/sample_bitwise_validator.C @@ -20,6 +20,7 @@ // A sample validator that grants credit if the majority of results are // bit-wise identical. +#include "config.h" #include "util.h" #include "sched_util.h" #include "sched_msgs.h" diff --git a/sched/sample_dummy_assimilator.C b/sched/sample_dummy_assimilator.C index 34ca55e1f2..54747344c2 100644 --- a/sched/sample_dummy_assimilator.C +++ b/sched/sample_dummy_assimilator.C @@ -19,6 +19,7 @@ // A sample assimilator that only writes a log message. +#include "config.h" #include #include "boinc_db.h" diff --git a/sched/sample_trivial_validator.C b/sched/sample_trivial_validator.C index b268a244de..7ba3991d33 100644 --- a/sched/sample_trivial_validator.C +++ b/sched/sample_trivial_validator.C @@ -20,6 +20,7 @@ // A sample validator that grants credit to any result whose CPU time is above // a certain minimum +#include "config.h" #include "validate_util.h" using std::vector; diff --git a/sched/sched_array.C b/sched/sched_array.C index f659b09144..b0dc16c453 100644 --- a/sched/sched_array.C +++ b/sched/sched_array.C @@ -20,6 +20,7 @@ // scheduler code related to sending work +#include "config.h" #include "main.h" #include "server_types.h" #include "sched_shmem.h" diff --git a/sched/sched_config.h b/sched/sched_config.h index 5e2a621152..3838606307 100644 --- a/sched/sched_config.h +++ b/sched/sched_config.h @@ -57,6 +57,7 @@ public: bool use_transactions; int daily_result_quota; // max results per host per day int uldl_dir_fanout; // fanout of ul/dl dirs; 0 if none + int uldl_dir_levels; int locality_scheduling_wait_period; int locality_scheduling_send_timeout; int min_core_client_version; diff --git a/sched/sched_hr.C b/sched/sched_hr.C index 4eca860d37..27fb60d571 100644 --- a/sched/sched_hr.C +++ b/sched/sched_hr.C @@ -20,6 +20,7 @@ // scheduler code related to sending work +#include "config.h" #include #include #include diff --git a/sched/sched_locality.C b/sched/sched_locality.C index 8170fb96bd..665eee2250 100644 --- a/sched/sched_locality.C +++ b/sched/sched_locality.C @@ -19,6 +19,7 @@ // Locality scheduling: see doc/sched_locality.php +#include "config.h" #include #include #include diff --git a/sched/sched_msgs.C b/sched/sched_msgs.C index 97029dc894..07e08db22a 100644 --- a/sched/sched_msgs.C +++ b/sched/sched_msgs.C @@ -17,6 +17,7 @@ // or write to the Free Software Foundation, Inc., // 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +#include "config.h" #include "sched_msgs.h" #ifdef _USING_FCGI_ diff --git a/sched/sched_resend.C b/sched/sched_resend.C index f2346e6a2e..db98de395f 100644 --- a/sched/sched_resend.C +++ b/sched/sched_resend.C @@ -20,6 +20,7 @@ // scheduler code related to sending work +#include "config.h" #include "error_numbers.h" #include "server_types.h" diff --git a/sched/sched_send.C b/sched/sched_send.C index 5c3d37356c..e08a1f4778 100644 --- a/sched/sched_send.C +++ b/sched/sched_send.C @@ -20,6 +20,7 @@ // scheduler code related to sending work +#include "config.h" #include #include #include diff --git a/sched/sched_shmem.C b/sched/sched_shmem.C index ce2ab75ddb..f9541fbc17 100644 --- a/sched/sched_shmem.C +++ b/sched/sched_shmem.C @@ -21,6 +21,7 @@ // the feeder (which reads from the database) // and instances of the scheduling server +#include "config.h" #include #include #include diff --git a/sched/sched_timezone.C b/sched/sched_timezone.C index dbd1a261ba..bfa6c4e439 100644 --- a/sched/sched_timezone.C +++ b/sched/sched_timezone.C @@ -20,6 +20,7 @@ // Scheduler code for directing a client to one of several // download servers based on its time zone +#include "config.h" #include #include diff --git a/sched/sched_util.C b/sched/sched_util.C index ea2649ea47..05d0e71782 100644 --- a/sched/sched_util.C +++ b/sched/sched_util.C @@ -19,6 +19,7 @@ using namespace std; +#include "config.h" #include #include #include diff --git a/sched/send_file.C b/sched/send_file.C index e562b30a68..ce469ef841 100644 --- a/sched/send_file.C +++ b/sched/send_file.C @@ -26,12 +26,12 @@ // Create a result entries, initialized to sent, and corresponding // messages to the get the files. - +#include "config.h" #if HAVE_UNISTD_H #include +#endif #include #include -#endif #include #include "boinc_db.h" diff --git a/sched/server_types.C b/sched/server_types.C index 4f720196c2..9a202e7f8f 100644 --- a/sched/server_types.C +++ b/sched/server_types.C @@ -16,7 +16,7 @@ // http://www.gnu.org/copyleft/lesser.html // or write to the Free Software Foundation, Inc., // 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - +#include "config.h" #include #include #include diff --git a/sched/show_shmem.C b/sched/show_shmem.C index f48e2be583..1df4201233 100644 --- a/sched/show_shmem.C +++ b/sched/show_shmem.C @@ -18,7 +18,7 @@ // 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // show_shmem: display WU part of shared-memory structure - +#include "config.h" #include #include #include diff --git a/sched/transitioner.C b/sched/transitioner.C index 30ae025bf0..7204be7e61 100644 --- a/sched/transitioner.C +++ b/sched/transitioner.C @@ -29,7 +29,7 @@ // [ -mod n i ] process only WUs with (id mod n) == i using namespace std; - +#include "config.h" #include #include #include diff --git a/sched/trickle_handler.C b/sched/trickle_handler.C index 1a1a32c08a..b4a5a5c6a7 100644 --- a/sched/trickle_handler.C +++ b/sched/trickle_handler.C @@ -32,7 +32,7 @@ // return nonzero on error using namespace std; - +#include "config.h" #include #include "boinc_db.h" diff --git a/sched/update_stats.C b/sched/update_stats.C index 06f7a508c4..5bc1db1711 100644 --- a/sched/update_stats.C +++ b/sched/update_stats.C @@ -27,7 +27,7 @@ // Also updates the nusers field of teams // // usage: update_stats [-update_teams] [-update_users] [-update_hosts] [-asynch] - +#include "config.h" #include #include #include diff --git a/sched/validate_util.C b/sched/validate_util.C index 3319c9f044..7b0e4b1cdd 100644 --- a/sched/validate_util.C +++ b/sched/validate_util.C @@ -22,6 +22,7 @@ // (see validate_trivial.C), // or that requires strict or fuzzy equality. +#include "config.h" #include #include "error_numbers.h" diff --git a/sched/validator.C b/sched/validator.C index 65ce536c1e..8de5ce1f8b 100644 --- a/sched/validator.C +++ b/sched/validator.C @@ -31,6 +31,7 @@ using namespace std; +#include "config.h" #include #include #include diff --git a/sched/validator_placeholder.C b/sched/validator_placeholder.C index 90aa100459..dae3cc79f5 100644 --- a/sched/validator_placeholder.C +++ b/sched/validator_placeholder.C @@ -20,6 +20,7 @@ // A sample validator that grants credit to any result whose CPU time is above // a certain minimum +#include "config.h" #include "validate_util.h" using std::vector; diff --git a/sched/wu_check.C b/sched/wu_check.C index 74af523089..5af0d6dc30 100644 --- a/sched/wu_check.C +++ b/sched/wu_check.C @@ -21,6 +21,7 @@ // look for results with missing input files // -repair change them to server_state OVER, outcome COULDNT_SEND +#include "config.h" #include #include "boinc_db.h" diff --git a/sea/make-tar.sh b/sea/make-tar.sh index 88280306fb..f5af50d0fe 100755 --- a/sea/make-tar.sh +++ b/sea/make-tar.sh @@ -4,6 +4,6 @@ rm -fr BOINC/.CVS mkdir BOINC mkdir BOINC/locale find ../locale/client -name '*.mo' | cut -d '/' -f 4 | awk '{print "BOINC/locale/"$0}' | xargs mkdir -find ../locale/client -name '*.mo' | cut -d '/' -f 4,5 | awk '{print "cp \"../locale/client/"$0"\" \"BOINC/locale/"$0"\""}' | bash +find ../locale/client -name '*.mo' | cut -d '/' -f 4,5 | awk '{print "cp \"../locale/client/"$0"\" \"BOINC/locale/"$0"\""}' | sh tar cvvf sea.tar BOINC/ diff --git a/sea/make-tar_debug.sh b/sea/make-tar_debug.sh index 7b3b6cd0f2..8620e1de53 100755 --- a/sea/make-tar_debug.sh +++ b/sea/make-tar_debug.sh @@ -4,6 +4,6 @@ rm -fr BOINC_debug/.CVS mkdir BOINC_debug mkdir BOINC_debug/locale find ../locale/client -name '*.mo' | cut -d '/' -f 4 | awk '{print "BOINC_debug/locale/"$0}' | xargs mkdir -find ../locale/client -name '*.mo' | cut -d '/' -f 4,5 | awk '{print "cp \"../locale/client/"$0"\" \"BOINC_debug/locale/"$0"\""}' | bash +find ../locale/client -name '*.mo' | cut -d '/' -f 4,5 | awk '{print "cp \"../locale/client/"$0"\" \"BOINC_debug/locale/"$0"\""}' | sh tar cvvf sea_debug.tar BOINC_debug/ diff --git a/tools/backend_lib.C b/tools/backend_lib.C index a4a3380c84..110bd9dd02 100644 --- a/tools/backend_lib.C +++ b/tools/backend_lib.C @@ -17,6 +17,7 @@ // or write to the Free Software Foundation, Inc., // 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +#include "config.h" #include #include #include diff --git a/tools/create_work.C b/tools/create_work.C index 870e88fdf7..e61617209f 100644 --- a/tools/create_work.C +++ b/tools/create_work.C @@ -44,6 +44,7 @@ // infile1 infile2 ... // +#include "config.h" #include #include #include diff --git a/tools/dir_hier_move.C b/tools/dir_hier_move.C index da6bb69668..5789cfe774 100644 --- a/tools/dir_hier_move.C +++ b/tools/dir_hier_move.C @@ -22,6 +22,7 @@ // move files from src_dir (flat) into dst_dir (hierarchical) // with the given fanout +#include "config.h" #include #include #include diff --git a/tools/dir_hier_path.C b/tools/dir_hier_path.C index 467303904a..270e57edc0 100644 --- a/tools/dir_hier_path.C +++ b/tools/dir_hier_path.C @@ -22,6 +22,7 @@ // Run this in a project's root directory. // Prints the absolute path of the file in the download hierarchy +#include "config.h" #include #include "util.h" diff --git a/tools/hr_db_convert.C b/tools/hr_db_convert.C index 044e178605..7c20744a87 100644 --- a/tools/hr_db_convert.C +++ b/tools/hr_db_convert.C @@ -2,6 +2,7 @@ // Converts old-style info (in result table) // to new style (using workseq_next field of workunit) +#include "config.h" #include "boinc_db.h" const int unspec = 0; diff --git a/tools/kill_wu.C b/tools/kill_wu.C index 476a6dbdd9..e72ede509f 100644 --- a/tools/kill_wu.C +++ b/tools/kill_wu.C @@ -4,6 +4,7 @@ // // Author: Christian Soettrup +#include "config.h" #include "boinc_db.h" #include #include diff --git a/tools/poll_wu.C b/tools/poll_wu.C index 2eeb6b579d..a0f1dbe21a 100644 --- a/tools/poll_wu.C +++ b/tools/poll_wu.C @@ -14,6 +14,7 @@ // // Author: Christian Soettrup +#include "config.h" #include "boinc_db.h" #include #include diff --git a/tools/process_result_template.C b/tools/process_result_template.C index 8a988ebd74..fccea54463 100644 --- a/tools/process_result_template.C +++ b/tools/process_result_template.C @@ -17,6 +17,7 @@ // or write to the Free Software Foundation, Inc., // 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +#include "config.h" #include #include #include diff --git a/tools/sign_executable.C b/tools/sign_executable.C index ab0748ef2e..de9b1334ff 100644 --- a/tools/sign_executable.C +++ b/tools/sign_executable.C @@ -19,6 +19,7 @@ // syntax: sign_executable +#include "config.h" #include "crypt.h" #include "backend_lib.h" #include