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

@@ -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)

api/api_app.C

@@ -19,6 +19,8 @@
 
 // test program for MFILE class
 
+#include "config.h"
+
 #include <cstdlib>
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>

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 <cstdio>
 #include <cstdlib>
 

api/bmplib.C

@@ -1,5 +1,7 @@
 #ifdef _WIN32
 #include "boinc_win.h"
+#else
+#include "config.h"
 #endif
 
 #include "bmplib.h"

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) {

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

api/boinc_checkpoint.C

@@ -19,6 +19,7 @@
 
 // Untested and unsupported code for checkpointing multiple files.
 
+#include "config.h"
 #include <iostream>
 #include <fstream>
 #include <sstream>

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"

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() {

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"
 

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 <dlfcn.h>
 
 #include "boinc_api.h"  

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

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 <stdio.h>
 
 int main(int argc, char** argv) {

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

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

api/static_graphics.C

@@ -25,6 +25,8 @@
 
 #ifdef _WIN32
 #include "boinc_win.h"
+#else
+#include "config.h"
 #endif
 
 #include "boinc_gl.h"

api/texture.C

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h> 
 #include <string.h>

api/tgalib.C

@@ -1,4 +1,4 @@
-
+#include "config.h"
 
 #include "tgalib.h"
 

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
 
 

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 <stdlib.h>
 #include <stdio.h>    
 #include <setjmp.h>    

apps/1sec.C

@@ -19,6 +19,7 @@
 
 // burn up to one CPU second
 
+#include "config.h"
 #include <cstdio>
 #include <ctime>
 

apps/concat.C

@@ -20,7 +20,7 @@
 // concat [-run_slow] file1 ... filen outfile
 //
 // concatenate files, write to outfile
-
+#include "config.h"
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>

apps/error.C

@@ -18,7 +18,7 @@
 // 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 // crash and burn
-
+#include "config.h"
 #include <cstdio>
 #include <cctype>
 

apps/upper_case.C

@@ -27,6 +27,8 @@
 
 #ifdef _WIN32
 #include "boinc_win.h"
+#else
+#include "config.h"
 #endif
 
 #ifndef _WIN32

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"

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"

client/app.C

@@ -25,6 +25,8 @@
 
 #ifdef _WIN32
 #include "boinc_win.h"
+#else 
+#include "config.h"
 #endif
 
 #ifndef _WIN32

client/app_control.C

@@ -24,9 +24,11 @@
 #ifdef _WIN32
 #include "boinc_win.h"
 #else
+#include "config.h"
 
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#include <csignal>
+#endif
 
 #if HAVE_SYS_IPC_H
 #include <sys/ipc.h>
@@ -34,8 +36,12 @@
 #if HAVE_SYS_RESOURCE_H
 #include <sys/resource.h>
 #endif
-#if HAVE_SYS_SIGNAL_H
+#ifdef HAVE_CSIGNAL
+#include <csignal>
+#elif defined(HAVE_SYS_SIGNAL_H)
 #include <sys/signal.h>
+#elif defined(HAVE_SIGNAL_H)
+#include <signal.h>
 #endif
 #if HAVE_SYS_WAIT_H
 #include <sys/wait.h>

client/app_graphics.C

@@ -23,6 +23,8 @@
 
 #ifdef _WIN32
 #include "boinc_win.h"
+#else
+#include "config.h"
 #endif
 
 #include "exception.h"

client/app_start.C

@@ -24,6 +24,7 @@
 #ifdef _WIN32
 #include "boinc_win.h"
 #else
+#include "config.h"
 #if HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif

client/check_state.C

@@ -24,6 +24,8 @@
 
 #ifdef _WIN32
 #include "boinc_win.h"
+#else
+#include "config.h"
 #endif
 
 #ifndef _WIN32

client/client_msgs.C

@@ -19,8 +19,8 @@
 
 #ifdef _WIN32
 #include "boinc_win.h"
-#endif
-#ifndef _WIN32
+#else
+#include "config.h"
 #include <cstdarg>
 #include <deque>
 #endif

client/client_state.C

@@ -24,6 +24,7 @@
 #endif
 
 #ifndef _WIN32
+#include "config.h"
 #if HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif

client/client_types.C

@@ -24,6 +24,7 @@
 #endif
 
 #ifndef _WIN32
+#include "config.h"
 #include <sys/stat.h>
 #include <sys/types.h>
 #endif

client/cs_account.C

@@ -22,6 +22,7 @@
 #endif
 
 #ifndef _WIN32
+#include "config.h"
 #include <cstdio>
 #include <cassert>
 #ifdef HAVE_SYS_STAT_H

client/cs_apps.C

@@ -28,6 +28,7 @@
 #endif
 
 #ifndef _WIN32
+#include "config.h"
 #include <cassert>
 #include <csignal>
 #endif

client/cs_benchmark.C

@@ -37,6 +37,7 @@
 #endif
 
 #ifndef _WIN32
+#include "config.h"
 #if HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif

client/cs_cmdline.C

@@ -22,6 +22,7 @@
 #ifdef _WIN32
 #include "boinc_win.h"
 #else
+#include "config.h"
 #include <stdio.h>
 #include <unistd.h>
 #endif

client/cs_data.C

@@ -31,6 +31,7 @@
 #endif
 
 #ifndef _WIN32
+#include "config.h"
 #include <sys/stat.h>
 #include <sys/types.h>
 #endif

client/cs_files.C

@@ -28,6 +28,7 @@
 #endif
 
 #ifndef _WIN32
+#include "config.h"
 #include <cassert>
 #include <sys/stat.h>
 #include <sys/types.h>

client/cs_prefs.C

@@ -26,6 +26,7 @@
 #endif
 
 #ifndef _WIN32
+#include "config.h"
 #if HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif

client/cs_scheduler.C

@@ -29,6 +29,7 @@
 #endif
 
 #ifndef _WIN32
+#include "config.h"
 #include <stdio.h>
 #include <math.h>
 #include <time.h>

client/cs_statefile.C

@@ -19,6 +19,8 @@
 
 #ifdef _WIN32
 #include "boinc_win.h"
+#else
+#include "config.h"
 #endif
 
 #include "parse.h"

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"

client/dhrystone.C

@@ -38,6 +38,8 @@
 
 #ifdef _WIN32
 #include "boinc_win.h"
+#else
+#include "config.h"
 #endif
 
 #include <cstdlib>

client/file_names.C

@@ -25,6 +25,7 @@
 #endif
 
 #ifndef _WIN32
+#include "config.h"
 #include <cstdio>
 #include <sys/stat.h>
 #include <cctype>

client/file_xfer.C

@@ -21,6 +21,8 @@
 
 #ifdef _WIN32
 #include "boinc_win.h"
+#else
+#include "config.h"
 #endif
 
 #include "util.h"

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"

client/gui_rpc_server.C

@@ -25,6 +25,7 @@
 #endif
 
 #ifndef _WIN32
+#include "config.h"
 #include <stdio.h>
 #include <unistd.h>
 #include <sys/socket.h>

client/gui_rpc_server_ops.C

@@ -24,6 +24,7 @@
 #endif
 
 #ifndef _WIN32
+#include "config.h"
 #include <stdio.h>
 #include <unistd.h>
 #include <sys/socket.h>

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

client/hostinfo_network.C

@@ -22,6 +22,7 @@
 #endif
 
 #ifndef _WIN32
+#include "config.h"
 #include <cstdio>
 #include <cstring>
 

client/hostinfo_unix.C

@@ -19,6 +19,8 @@
 
 #include "cpp.h"
 
+#include "config.h"
+
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>

client/http.C

@@ -22,6 +22,7 @@
 #ifdef _WIN32
 #include "boinc_win.h"
 #else
+#include "config.h"
 #include <cstring>
 #include <sstream>
 #include <algorithm>

client/http_curl.C

@@ -22,6 +22,7 @@
 #ifdef _WIN32
 #include "boinc_win.h"
 #else
+#include "config.h"
 #include <cstring>
 #include <sstream>
 #include <algorithm>

client/log_flags.C

@@ -24,6 +24,7 @@
 #endif
 
 #ifndef _WIN32
+#include "config.h"
 #include <cstdio>
 #include <cstring>
 #endif

client/net_stats.C

@@ -31,6 +31,7 @@
 #endif
 
 #ifndef _WIN32
+#include "config.h"
 #include <cstring>
 #include <cmath>
 #endif

client/net_xfer.C

@@ -32,6 +32,7 @@
 #endif
 
 #ifndef _WIN32
+#include "config.h"
 #include <cstdio>
 #include <unistd.h>
 #include <arpa/inet.h>

client/net_xfer_curl.C

@@ -33,6 +33,7 @@
 #endif
 
 #ifndef _WIN32
+#include "config.h"
 #include <cstdio>
 #include <unistd.h>
 #include <arpa/inet.h>

client/pers_file_xfer.C

@@ -24,6 +24,7 @@
 #endif
 
 #ifndef _WIN32
+#include "config.h"
 #include <cmath>
 #include <cstdlib>
 #endif

client/proxy.C

@@ -22,6 +22,7 @@
 #ifdef _WIN32
 #include "boinc_win.h"
 #else
+#include "config.h"
 #include <sys/stat.h>
 #include <sys/socket.h>
 #include <netinet/in.h>

client/scheduler_op.C

@@ -22,6 +22,7 @@
 #endif
 
 #ifndef _WIN32
+#include "config.h"
 #include <cmath>
 #include <cstdlib>
 #include <cstdio>

client/ss_logic.C

@@ -19,6 +19,8 @@
 
 #ifdef _WIN32
 #include "boinc_win.h"
+#else
+#include "config.h"
 #endif
 
 #include "client_state.h"

client/ssl_http.C

@@ -26,6 +26,7 @@ using std::string;
 #endif
 
 #ifndef _WIN32
+#include "config.h"
 #include <cstring>
 #include <sstream>
 #include <algorithm>

client/ssl_net_xfer.C

@@ -32,6 +32,7 @@
 #endif
 
 #ifndef _WIN32
+#include "config.h"
 
 #include <stdio.h>
 #include <math.h>

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 <cstdio>
 #include <cstdlib>
 #include <unistd.h>

client/test_http.C

@@ -26,6 +26,8 @@
 #ifdef _WIN32
 #include "winsock.h"
 #include "win_net.h"
+#else
+#include "config.h"
 #endif
 #include <cstdio>
 #if HAVE_UNISTD_H

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 <unistd.h>

client/time_stats.C

@@ -22,6 +22,7 @@
 #endif
 
 #ifndef _WIN32
+#include "config.h"
 #include <cstdio>
 #include <ctime>
 #include <cmath>

client/whetstone.C

@@ -25,6 +25,7 @@
 #endif
 
 #ifndef _WIN32
+#include "config.h"
 #include <cstdlib>
 #include <cstdio>
 #include <cstring>

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 <cstdlib>
 #include <cstring>
 #include <ctime>

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 <cstdio>
 #include <cstring>
 #include <cstdlib>

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

lib/app_ipc.C

@@ -22,6 +22,7 @@
 #endif
 
 #ifndef _WIN32
+#include "config.h"
 #include <cstring>
 #endif
 

lib/base64.C

@@ -21,6 +21,7 @@
 #include "boinc_win.h"
 #endif
 
+#include "config.h"
 #include "base64.h"
 
 #ifdef _USING_FCGI_

lib/boinc_cmd.C

@@ -29,6 +29,7 @@
 #endif
 
 #ifndef _WIN32
+#include "config.h"
 #include <cstdio>
 #include <unistd.h>
 #endif

lib/crypt.C

@@ -22,6 +22,7 @@
 #endif
 
 #ifndef _WIN32
+#include "config.h"
 #include <cctype>
 #include <cstdio>
 #include <cstdlib>

lib/crypt_prog.C

@@ -31,6 +31,7 @@
 // -test_crypt private_keyfile public_keyfile
 //                  test encrypt/decrypt
 
+#include "config.h"
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>

lib/diagnostics.C

@@ -25,6 +25,7 @@
 #endif
 
 #ifndef _WIN32
+#include "config.h"
 #include <cstdio>
 #include <cstdarg>
 #include <cstdlib>

lib/exception.C

@@ -22,6 +22,7 @@
 #endif
 
 #ifndef _WIN32
+#include "config.h"
 #include "cstdio"
 #include "cstdlib"
 #include "unistd.h"

lib/filesys.C

@@ -22,6 +22,7 @@
 #endif
 
 #ifndef _WIN32
+#include "config.h"
 #include <cstdio>
 #include <fcntl.h>
 #include <cerrno>

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);

lib/hostinfo.C

@@ -22,6 +22,7 @@
 #endif
 
 #ifndef _WIN32
+#include "config.h"
 #include <cstdio>
 #include <cstring>
 

lib/language.C

@@ -22,6 +22,7 @@
 #endif
 
 #ifndef _WIN32
+#include "config.h"
 #include <cstring>
 #include <cstdlib>
 #endif

lib/md5_file.C

@@ -22,6 +22,7 @@
 #endif
 
 #ifndef _WIN32
+#include "config.h"
 #include <cstdio>
 #endif
 

lib/mem_usage.C

@@ -22,6 +22,7 @@
 #endif
 
 #ifndef _WIN32
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>

lib/mfile.C

@@ -22,6 +22,7 @@
 #endif
 
 #ifndef _WIN32
+#include "config.h"
 #include <cstdio>
 #include <cstdlib>
 #include <cstdarg>

lib/miofile.C

@@ -22,6 +22,7 @@
 #endif
 
 #ifndef _WIN32
+#include "config.h"
 #include <string>
 #include <cstring>
 #include <cstdarg>

lib/msg_log.C

@@ -22,6 +22,7 @@
 #endif
 
 #ifndef _WIN32
+#include "config.h"
 #include <cassert>
 #include <cstring>
 #include <string>

lib/msg_queue.C

@@ -19,6 +19,7 @@
 
 // interfaces for accessing message queues
 
+#include "config.h"
 #include <cstdio>
 #include <cstring>
 

lib/msg_test.C

@@ -27,6 +27,7 @@
 
 #define KEY 0xb01fcafe
 
+#include "config.h"
 #include <cstring>
 #include <cstdio>
 

lib/network.C

@@ -22,6 +22,7 @@
 #endif
 
 #ifndef _WIN32
+#include "config.h"
 #include <unistd.h>
 #include <cstdio>
 #include <sys/socket.h>

lib/parse.C

@@ -29,6 +29,7 @@
 #endif
 
 #ifndef _WIN32
+#include "config.h"
 #include <cstring>
 #include <cstdlib>
 #include <locale>

lib/prefs.C

@@ -22,6 +22,7 @@
 #endif
 
 #ifndef _WIN32
+#include "config.h"
 #include <cstdio>
 #include <cstring>
 #include <cstdlib>

lib/proxy_info.C

@@ -21,6 +21,7 @@
 #include "boinc_win.h"
 #endif
 
+#include "config.h"
 #include <string>
 using std::string;
 

lib/shmem.C

@@ -24,6 +24,7 @@
 #endif
 
 #ifndef _WIN32
+#include "config.h"
 #include <cstdio>
 #include <cstring>
 #include <sys/types.h>

lib/shmem_test.C

@@ -25,6 +25,7 @@
 
 #define KEY 0xbeefcafe
 
+#include "config.h"
 #include <cstring>
 #include <cstdio>
 #include <sys/wait.h>

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 <pthread.h>
 #include <sched.h>
 #include <signal.h>

lib/synch.C

@@ -20,6 +20,7 @@
 
 // interfaces for accessing sempahores
 
+#include "config.h"
 #include <cstdio>
 #include <cstring>
 

lib/synch_test.C

@@ -21,6 +21,7 @@
 // -d       destroy semaphore
 // -l       lock semaphore, sleep 10 secs, unlock
 
+#include "config.h"
 #include <unistd.h>
 
 #include "synch.h"