From 637aa3b6880edfca7550c5a08919474b275ff06f Mon Sep 17 00:00:00 2001 From: David Anderson Date: Thu, 30 Dec 2004 03:03:26 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=4962 --- api/boinc_api.C | 2 +- checkin_notes | 36 ++++ client/client_types.C | 8 +- client/client_types.h | 5 +- client/cpp.h | 2 +- client/cs_scheduler.C | 3 + client/gui_rpc_server.C | 10 +- client/win/boinc_cli.rc | 4 +- client/win/boinc_dll.rc | 4 +- client/win/boinc_gui.h | 1 + client/win/boinc_gui.rc | 5 +- client/win/boinc_ss.rc | 4 +- client/win/wingui_mainwindow.cpp | 24 +++ client/win/wingui_mainwindow.h | 2 + lib/gui_rpc_client.C | 17 +- lib/gui_rpc_client.h | 1 + lib/gui_test.C | 8 + lib/mem_usage.C | 1 - win_build/config.h | 1 - win_build/win-config.h | 337 ------------------------------- win_config.h | 3 - 21 files changed, 118 insertions(+), 360 deletions(-) delete mode 100644 win_build/win-config.h delete mode 100644 win_config.h diff --git a/api/boinc_api.C b/api/boinc_api.C index f1e0e80b56b..4f5248eb8ee 100644 --- a/api/boinc_api.C +++ b/api/boinc_api.C @@ -22,7 +22,7 @@ #ifdef _WIN32 #include "boinc_win.h" -#include "win_config.h" +#include "version.h" #else #include "config.h" #include diff --git a/checkin_notes b/checkin_notes index 8d5253376d2..707e09cbc66 100755 --- a/checkin_notes +++ b/checkin_notes @@ -21949,3 +21949,39 @@ Bruce 29 Dec 2004 html/ inc/ db_ops.inc + +David 29 Dec 2004 + - (from James Drews) Add a "don't request more work" request for projects. + Inhibits requesting more work, + but allows completion and reporting of work to continue. + Added a GUI RPC to do this, + and also a menu command in the old Win GUI. + Implemented using a boolean in PROJECT + (saved/restored in client_state.xml) + - Removed win_config.h and win-config.h. + Put all "#ifdef HAVE_*" constructs inside #ifndef _WIN32 + Include version.h to get BOINC_MAJOR_VERSION etc. + + Now - what exactly are the roles of client/cpp.h and boinc_win.h??? + + win_config.h (removed) + api/ + boinc_api.C + client/ + client_types.C,h + cpp.h + cs_scheduler.C + gui_rpc_server.C + win/ + boinc_cli.rc + boinc_dll.rc + boinc_gui.h,rc + boinc_ss.rc + wingui_mainwindow.cpp,h + lib/ + gui_rpc_client.C,h + gui_test.C + mem_usage.C + win_build/ + config.h + win-config.h (removed) diff --git a/client/client_types.C b/client/client_types.C index 76ad115c12c..9f364c5ce80 100644 --- a/client/client_types.C +++ b/client/client_types.C @@ -89,6 +89,7 @@ void PROJECT::init() { send_file_list = false; non_cpu_intensive = false; suspended_via_gui = false; + dont_request_more_work = false; #if 0 deletion_policy_priority = false; deletion_policy_expire = false; @@ -184,6 +185,7 @@ int PROJECT::parse_state(MIOFILE& in) { else if (match_tag(buf, "")) send_file_list = true; else if (match_tag(buf, "")) non_cpu_intensive = true; else if (match_tag(buf, "")) suspended_via_gui = true; + else if (match_tag(buf, "")) dont_request_more_work = true; #if 0 else if (match_tag(buf, "")) deletion_policy_priority = true; else if (match_tag(buf, "")) deletion_policy_expire = true; @@ -235,7 +237,7 @@ int PROJECT::write_state(MIOFILE& out, bool gui_rpc) { " %f\n" " %f\n" " %f\n" - "%s%s%s%s%s", + "%s%s%s%s%s%s", master_url, project_name, #if 0 @@ -265,7 +267,8 @@ int PROJECT::write_state(MIOFILE& out, bool gui_rpc) { sched_rpc_pending?" \n":"", send_file_list?" \n":"", non_cpu_intensive?" \n":"", - suspended_via_gui?" \n":"" + suspended_via_gui?" \n":"", + dont_request_more_work?" \n":"" ); #if 0 out.printf( @@ -328,6 +331,7 @@ void PROJECT::copy_state_fields(PROJECT& p) { send_file_list = p.send_file_list; non_cpu_intensive = p.non_cpu_intensive; suspended_via_gui = p.suspended_via_gui; + dont_request_more_work = p.dont_request_more_work; #if 0 deletion_policy_priority = p.deletion_policy_priority; deletion_policy_expire = p.deletion_policy_expire; diff --git a/client/client_types.h b/client/client_types.h index 84b0e08aeb8..3c34a3997d9 100644 --- a/client/client_types.h +++ b/client/client_types.h @@ -201,7 +201,10 @@ class PROJECT { // send the list of permanent files associated/with the project // in the next scheduler reply bool suspended_via_gui; - + bool dont_request_more_work; + // set the project to only return work and not request more + // for a clean exit to a project, or if a user wants to + // pause doing work for the project char code_sign_key[MAX_BLOB_LEN]; std::vector user_files; int parse_preferences_for_user_files(); diff --git a/client/cpp.h b/client/cpp.h index cb9049689d6..1b13deb95fe 100644 --- a/client/cpp.h +++ b/client/cpp.h @@ -19,7 +19,7 @@ #ifdef _WIN32 #define HOSTTYPE "windows_intelx86" -#include "win_config.h" // version numbers from autoconf +#include "version.h" // version numbers from autoconf #endif #ifndef _WIN32 diff --git a/client/cs_scheduler.C b/client/cs_scheduler.C index 7994d5c515f..07b547481e8 100644 --- a/client/cs_scheduler.C +++ b/client/cs_scheduler.C @@ -134,6 +134,7 @@ PROJECT* CLIENT_STATE::next_project_sched_rpc_pending() { // 1) is eligible for a scheduler RPC // 2) has work_request > 0 // 3) has master_url_fetch_pending == false +// 4) has dont_request_more_work == false // PROJECT* CLIENT_STATE::next_project_need_work(PROJECT *old) { PROJECT *p; @@ -149,6 +150,7 @@ PROJECT* CLIENT_STATE::next_project_need_work(PROJECT *old) { if (p->master_url_fetch_pending) continue; if (p->waiting_until_min_rpc_time(now)) continue; if (p->suspended_via_gui) continue; + if (p->dont_request_more_work) continue; if (found_old && p->work_request > 0) { return p; } @@ -391,6 +393,7 @@ int CLIENT_STATE::compute_work_requests() { p->work_request = 0; if (p->min_rpc_time >= now) continue; + if (p->dont_request_more_work) continue; // determine urgency // diff --git a/client/gui_rpc_server.C b/client/gui_rpc_server.C index 08a6b9821df..db3224d3101 100644 --- a/client/gui_rpc_server.C +++ b/client/gui_rpc_server.C @@ -170,7 +170,11 @@ static void handle_project_op(char* buf, MIOFILE& fout, char* op) { } else if (!strcmp(op, "update")) { p->sched_rpc_pending = true; p->min_rpc_time = 0; - } + } else if (!strcmp(op, "nomorework")) { + p->dont_request_more_work = true; + } else if (!strcmp(op, "allowmorework")) { + p->dont_request_more_work = false; + } gstate.must_schedule_cpus = true; fout.printf("\n"); } @@ -485,6 +489,10 @@ int GUI_RPC_CONN::handle_rpc() { handle_project_op(request_msg, mf, "resume"); } else if (match_tag(request_msg, "dont_request_more_work) { + proj->dont_request_more_work = false; + show_message(proj,"Allowing more work to be requested from project",MSG_INFO); + } else { + proj->dont_request_more_work = true; + show_message(proj,"Won't request any more work from project",MSG_INFO); + } +} + ////////// // CMainWindow::OnCommandWorkShowGraphics // arguments: void @@ -1973,6 +1995,8 @@ void CMainWindow::OnRButtonDown(UINT nFlags, CPoint point) pContextMenu->ModifyMenu(ID_PROJECT_GET_PREFS, 0, ID_PROJECT_GET_PREFS, ((proj && proj->min_rpc_time > dtime()) ? m_MenuLabelRetryNow : m_MenuLabelGetPreferences)); + pContextMenu->ModifyMenu(ID_PROJECT_NOMOREWORK, 0, ID_PROJECT_NOMOREWORK, + (proj->dont_request_more_work?m_MenuLabelGetWork:m_MenuLabelNoMoreWork)); break; } case RESULT_MENU: diff --git a/client/win/wingui_mainwindow.h b/client/win/wingui_mainwindow.h index 69e31e1d807..c2c4aa33b38 100755 --- a/client/win/wingui_mainwindow.h +++ b/client/win/wingui_mainwindow.h @@ -159,6 +159,7 @@ class CMainWindow : public CWnd afx_msg void OnCommandProjectGetPrefs(); afx_msg void OnCommandProjectDetach(); afx_msg void OnCommandProjectReset(); + afx_msg void OnCommandProjectNoMoreWork(); afx_msg void OnCommandWorkShowGraphics(); afx_msg void OnCommandTransfersRetryNow(); afx_msg void OnCommandFileClearInactive(); @@ -187,6 +188,7 @@ class CMainWindow : public CWnd CString m_MenuLabelRetryNow, m_MenuLabelGetPreferences; CString m_DialogResetQuery, m_DialogDetachQuery; + CString m_MenuLabelGetWork, m_MenuLabelNoMoreWork; DECLARE_MESSAGE_MAP() diff --git a/lib/gui_rpc_client.C b/lib/gui_rpc_client.C index 784b21c3358..08c8b123a17 100644 --- a/lib/gui_rpc_client.C +++ b/lib/gui_rpc_client.C @@ -22,7 +22,6 @@ #ifdef _WIN32 #include "boinc_win.h" #include "version.h" -#include "win_config.h" #endif #ifndef _WIN32 @@ -110,6 +109,10 @@ int PROJECT::parse(MIOFILE& in) { suspended_via_gui = true; continue; } + else if (match_tag(buf, "")) { + dont_request_more_work = true; + continue; + } else if (match_tag(buf, "")) { tentative = true; continue; @@ -149,6 +152,7 @@ void PROJECT::print() { printf(" scheduler RPC pending: %s\n", sched_rpc_pending?"yes":"no"); printf(" tentative: %s\n", tentative?"yes":"no"); printf(" suspended via GUI: %s\n", suspended_via_gui?"yes":"no"); + printf(" don't request more work: %s\n", dont_request_more_work?"yes":"no"); for (i=0; isock == 0) return ERR_CONNECT; + if (rpc_client->sock == 0) return ERR_CONNECT; retval = rpc_client->send_request(req); if (retval) return retval; retval = rpc_client->get_reply(mbuf); @@ -1173,6 +1178,10 @@ int RPC_CLIENT::project_op(PROJECT& project, char* op) { tag = "project_suspend"; } else if (!strcmp(op, "resume")) { tag = "project_resume"; + } else if (!strcmp(op, "allowmorework")) { + tag = "project_allowmorework"; + } else if (!strcmp(op, "nomorework")) { + tag = "project_nomorework"; } else { return -1; } diff --git a/lib/gui_rpc_client.h b/lib/gui_rpc_client.h index ddef13b93d6..c583f926870 100644 --- a/lib/gui_rpc_client.h +++ b/lib/gui_rpc_client.h @@ -86,6 +86,7 @@ class PROJECT { bool sched_rpc_pending; // contact scheduling server for preferences bool tentative; // master URL and account ID not confirmed bool suspended_via_gui; + bool dont_request_more_work; PROJECT(); ~PROJECT(); diff --git a/lib/gui_test.C b/lib/gui_test.C index e41a066269d..6caa86f84c9 100644 --- a/lib/gui_test.C +++ b/lib/gui_test.C @@ -32,6 +32,8 @@ // -project_attach url auth // -project_detach url // -project_update url +// -project_nomorework url +// -project_allowmorework url // -run_benchmarks // -set_proxy_settings @@ -136,6 +138,12 @@ int main(int argc, char** argv) { } else if (!strcmp(argv[i], "-project_update")) { project.master_url = argv[++i]; retval = rpc.project_op(project, "update"); + } else if (!strcmp(argv[i], "-project_nomorework")) { + project.master_url = argv[++i]; + retval = rpc.project_op(project, "nomorework"); + } else if (!strcmp(argv[i], "-project_allowmorework")) { + project.master_url = argv[++i]; + retval = rpc.project_op(project, "allowmorework"); } else if (!strcmp(argv[i], "-run_benchmarks")) { retval = rpc.run_benchmarks(); } diff --git a/lib/mem_usage.C b/lib/mem_usage.C index e4317382b13..59ecba68c2f 100644 --- a/lib/mem_usage.C +++ b/lib/mem_usage.C @@ -1,6 +1,5 @@ #ifdef _WIN32 #include "boinc_win.h" -#include "win_config.h" #else #include #include diff --git a/win_build/config.h b/win_build/config.h index a6dd6bbb48f..e69de29bb2d 100644 --- a/win_build/config.h +++ b/win_build/config.h @@ -1 +0,0 @@ -#include "win-config.h" \ No newline at end of file diff --git a/win_build/win-config.h b/win_build/win-config.h deleted file mode 100644 index 5090dfe7437..00000000000 --- a/win_build/win-config.h +++ /dev/null @@ -1,337 +0,0 @@ -// Copyright 2003 Regents of the University of California - -// SETI_BOINC is free software; you can redistribute it and/or modify it under -// the terms of the GNU General Public License as published by the Free -// Software Foundation; either version 2, or (at your option) any later -// version. - -// SETI_BOINC is distributed in the hope that it will be useful, but WITHOUT -// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -// more details. - -// You should have received a copy of the GNU General Public License along -// with SETI_BOINC; see the file COPYING. If not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -/* config.h. Generated by configure. */ - -#ifndef _SAH_WIN_CONFIG_H_ -#define _SAH_WIN_CONFIG_H_ - -/* Define to 1 if you have the `atexit' function. */ -#define HAVE_ATEXIT 1 - -/* Define to 1 if you have the `atoll' function. */ -/* #define HAVE_ATOLL 1 */ - -/* Define to 1 if the system has the type `bool'. */ -#define HAVE_BOOL 1 - -/* Define to 1 if you have the header file. */ -/* #define HAVE_DIRENT_H 1 */ - -/* Define to 1 if you have the header file. */ -#define HAVE_FCNTL_H 1 - -/* Define to 1 if you have the `floor' function. */ -#define HAVE_FLOOR 1 - -/* Define to 1 if you have the `fork' function. */ -//#define HAVE_FORK 1 - -/* Define to 1 if you have the `getcwd' function. */ -#define HAVE_GETCWD 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_GLUT_GLUT_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_GLUT_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_GLU_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_GL_GLUT_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_GL_GLU_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_GL_GL_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_GL_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_INTTYPES_H */ - -/* Define to 1 if you have the `aio' library (-laio). */ -//#define HAVE_LIBAIO 1 - -/* Define to 1 if you have the `dl' library (-ldl). */ -//#define HAVE_LIBDL 1 - -/* Define to 1 if you have the `elf' library (-lelf). */ -//#define HAVE_LIBELF 1 - -/* Define to 1 if you have the `fftw' library (-lfftw). */ -/* #undef HAVE_LIBFFTW */ - -/* Define to 1 if you have the `GL' library (-lGL). */ -#define HAVE_LIBGL 1 - -/* Define to 1 if you have the `ICE' library (-lICE). */ -//#define HAVE_LIBICE 1 - -/* Define to 1 if you have the `m' library (-lm). */ -#define HAVE_LIBM 1 - -/* Define to 1 if you have the `nsl' library (-lnsl). */ -//#define HAVE_LIBNSL 1 - -/* Define to 1 if you have the `rsaeuro' library (-lrsaeuro). */ -/* #undef HAVE_LIBRSAEURO */ - -/* Define to 1 if you have the `s4' library (-ls4). */ -/* #undef HAVE_LIBS4 */ - -/* Define to 1 if you have the `SM' library (-lSM). */ -//#define HAVE_LIBSM 1 - -/* Define to 1 if you have the `socket' library (-lsocket). */ -//#define HAVE_LIBSOCKET 1 - -/* Define to 1 if you have the `stdc++' library (-lstdc++). */ -//#define HAVE_LIBSTDC__ 1 - -/* Define to 1 if you have the `X11' library (-lX11). */ -//#define HAVE_LIBX11 1 - -/* Define to 1 if you have the `Xaw' library (-lXaw). */ -//#define HAVE_LIBXAW 1 - -/* Define to 1 if you have the `Xext' library (-lXext). */ -//#define HAVE_LIBXEXT 1 - -/* Define to 1 if you have the `Xmu' library (-lXmu). */ -//#define HAVE_LIBXMU 1 - -/* Define to 1 if you have the `Xt' library (-lXt). */ -/* #define HAVE_LIBXT 1 */ - -/* Define to 1 if you have the `z' library (-lz). */ -/* #define HAVE_LIBZ 1 */ - -/* Define to 1 if you have the header file. */ -#define HAVE_LIMITS_H 1 - -/* Define to 1 if long double works and has more range or precision than - double. */ -#define HAVE_LONG_DOUBLE 1 - -/* Define to 1 if the system has the type `long long'. */ -/* #undef HAVE_LONG_LONG */ - -/* Define to 1 if your system has a GNU libc compatible `malloc' function, and - to 0 otherwise. */ -#define HAVE_MALLOC 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_MEMORY_H 1 - -/* Define to 1 if you have the `memset' function. */ -#define HAVE_MEMSET 1 - -/* Define to 1 if you have the `munmap' function. */ -/* #define HAVE_MUNMAP 1 */ - -/* Define if your C++ compiler supports namespaces */ -#define HAVE_NAMESPACES 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_OPENGL_GLUT_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_OPENGL_GLU_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_OPENGL_GL_H */ - -/* Define to 1 if you have the `putenv' function. */ -#define HAVE_PUTENV 1 - -/* Define to 1 if your system has a GNU libc compatible `realloc' function, - and to 0 otherwise. */ -#define HAVE_REALLOC 1 - -/* Define to 1 if you have the `sqrt' function. */ -#define HAVE_SQRT 1 - -/* Define to 1 if `stat' has the bug that it succeeds when given the - zero-length file name argument. */ -/* #undef HAVE_STAT_EMPTY_STRING_BUG */ - -#if ( _MSC_VER > 1300 ) - /* Define to 1 if the max template is in namespace std. */ - #define HAVE_STD_MAX 1 - - /* Define to 1 if the min template is in namespace std. */ - #define HAVE_STD_MIN 1 -#endif - -/* Define to 1 if the transform template is in namespace std. */ -#define HAVE_STD_TRANSFORM 1 - -/* Define to 1 if stdbool.h conforms to C99. */ -/* #undef HAVE_STDBOOL_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_STDINT_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_STDLIB_H 1 - -/* Define to 1 if you have the `strchr' function. */ -#define HAVE_STRCHR 1 - -/* Define to 1 if you have the `strftime' function. */ -#define HAVE_STRFTIME 1 - -/* Define to 1 if you have the header file. */ -/* #define HAVE_STRINGS_H 1 */ - -/* Define to 1 if you have the header file. */ -#define HAVE_STRING_H 1 - -/* Define to 1 if you have the `strstr' function. */ -#define HAVE_STRSTR 1 - -/* Define to 1 if `st_blocks' is member of `struct stat'. */ -/* #define HAVE_STRUCT_STAT_ST_BLOCKS 1 */ - -/* Define to 1 if your `struct stat' has `st_blocks'. Deprecated, use - `HAVE_STRUCT_STAT_ST_BLOCKS' instead. */ -/* #define HAVE_ST_BLOCKS 1 */ - -/* Define to 1 if you have the header file. */ -/* #define HAVE_SYS_IOCTL_H 1 */ - -/* Define to 1 if you have the header file. */ -/* #define HAVE_SYS_STATVFS_H 1 */ - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_TIME_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define to 1 if you have that is POSIX.1 compatible. */ -/* #define HAVE_SYS_WAIT_H 1 */ - -/* Define to 1 if you have the header file. */ -/* #define HAVE_UNISTD_H 1 */ - -/* Define to 1 if you have the `vfork' function. */ -/* #define HAVE_VFORK 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_VFORK_H */ - -/* Define to 1 if `fork' works. */ -/* #define HAVE_WORKING_FORK 1 */ - -/* Define to 1 if `vfork' works. */ -/* #define HAVE_WORKING_VFORK 1 */ - -/* Define to 1 if the system has the type `_Bool'. */ -/* #undef HAVE__BOOL */ - -/* Define to 1 if the system has the type `_int64'. */ -/* #define HAVE__INT64 1 */ - -/* Define to 1 if `lstat' dereferences a symlink specified with a trailing - slash. */ -/* #undef LSTAT_FOLLOWS_SLASHED_SYMLINK */ - -/* Define to 1 if `major', `minor', and `makedev' are declared in . - */ -#define MAJOR_IN_MKDEV 1 - -/* Define to 1 if `major', `minor', and `makedev' are declared in - . */ -/* #undef MAJOR_IN_SYSMACROS */ - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "ports@setiathome.ssl.berkeley.edu" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "setiathome" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "setiathome 4.00" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "setiathome" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "4.00" - -/* The size of a `long double', as computed by sizeof. */ -#define SIZEOF_LONG_DOUBLE sizeof (long double) - -/* The size of a `long int', as computed by sizeof. */ -#define SIZEOF_LONG_INT 4 - -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Define to 1 if your declares `struct tm'. */ -/* #undef TM_IN_SYS_TIME */ - -/* Define to 1 if informix is installed */ -/* #undef USE_INFORMIX */ - -/* Define if MYSQL is installed */ -/* #undef USE_MYSQL */ - -/* SETI@home major version number */ -#define VERSION_MAJOR 4 - -/* SETI@home minor version number */ -#define VERSION_MINOR 13 - -/* Define to empty if `const' does not conform to ANSI C. */ -/* #undef const */ - -/* Define as `__inline' if that's what the C compiler calls it, or to nothing - if it is not supported. */ -/* #undef inline */ - -/* Define to rpl_malloc if the replacement function should be used. */ -/* #undef malloc */ - -/* Define to `long' if does not define. */ -/* #undef off_t */ - -/* Define to `int' if does not define. */ -/* #undef pid_t */ - -/* Define to rpl_realloc if the replacement function should be used. */ -/* #undef realloc */ - -/* Define to `unsigned' if does not define. */ -/* #undef size_t */ - -/* Define as `fork' if `vfork' does not work. */ -/* #undef vfork */ - -#if defined(USE_INFORMIX) && defined(USE_MYSQL) && defined(HAVE_NAMESPACES) -#define USE_NAMESPACES -#endif - -#endif diff --git a/win_config.h b/win_config.h deleted file mode 100644 index b1f2f274c39..00000000000 --- a/win_config.h +++ /dev/null @@ -1,3 +0,0 @@ -#define BOINC_MAJOR_VERSION 4 -#define BOINC_MINOR_VERSION 57 -#define BOINC_VERSION_STRING "4.57"