diff --git a/checkin_notes b/checkin_notes
index d73c00cdea..34d80e9ca9 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -8732,3 +8732,15 @@ David 25 Sept 2007
common_defs.h
gui_rpc_client.h
gui_rpc_client_ops.C
+
+David 25 Sept 2007
+ - compile fixes for Win
+
+ client/
+ sim_util.C
+ clientgui/
+ BOINCGUIApp.cpp
+ clientscr/
+ screensaver_win.cpp
+ win_build/
+ boinc_cli_curl.vcproj
diff --git a/client/sim_util.C b/client/sim_util.C
index 269de6b39d..e7efb627b0 100644
--- a/client/sim_util.C
+++ b/client/sim_util.C
@@ -285,9 +285,7 @@ ACTIVE_TASK::ACTIVE_TASK() {
scheduler_state = CPU_SCHED_UNINITIALIZED;
signal = 0;
strcpy(slot_dir, "");
- is_ss_app = false;
graphics_mode_acked = MODE_UNSUPPORTED;
- graphics_mode_before_ss = MODE_HIDE_GRAPHICS;
graphics_mode_ack_timeout = 0;
exit_requested = false;
fraction_done = 0;
diff --git a/clientgui/BOINCGUIApp.cpp b/clientgui/BOINCGUIApp.cpp
index f5afaae24b..feb258422a 100644
--- a/clientgui/BOINCGUIApp.cpp
+++ b/clientgui/BOINCGUIApp.cpp
@@ -496,7 +496,6 @@ bool CBOINCGUIApp::IsBOINCCoreRunning() {
wxLogTrace(wxT("Function Start/End"), wxT("CBOINCGUIApp::IsBOINCCoreRunning - Function Begin"));
int retval;
- int scrsave_mode;
bool running = false;
RPC_CLIENT rpc;
@@ -507,8 +506,6 @@ bool CBOINCGUIApp::IsBOINCCoreRunning() {
} else {
retval = rpc.init("localhost"); // synchronous is OK since local
wxLogTrace(wxT("Function Status"), wxT("CBOINCGUIApp::IsBOINCCoreRunning - Connecting to core client returned '%d'"), retval);
- retval = rpc.get_screensaver_mode(scrsave_mode);
- wxLogTrace(wxT("Function Status"), wxT("CBOINCGUIApp::IsBOINCCoreRunning - Requesting screen saver mode... retval '%d', scrsave_mode '%d'"), retval, scrsave_mode);
running = (retval == 0);
rpc.close();
}
@@ -519,7 +516,6 @@ bool CBOINCGUIApp::IsBOINCCoreRunning() {
(TickCount() < (120*60)); // If system has been up for less than 2 minutes
for (int i=0; i<10; i++) {
retval = rpc.init("localhost"); // synchronous is OK since local
- retval = rpc.get_screensaver_mode(scrsave_mode);
running = (retval == 0);
rpc.close();
if (running) break;
@@ -528,7 +524,6 @@ bool CBOINCGUIApp::IsBOINCCoreRunning() {
}
#else
retval = rpc.init("localhost"); // synchronous is OK since local
- retval = rpc.get_screensaver_mode(scrsave_mode);
running = (retval == 0);
rpc.close();
#endif
diff --git a/clientscr/screensaver_win.cpp b/clientscr/screensaver_win.cpp
index 69c2d3e3d4..6e1983089c 100755
--- a/clientscr/screensaver_win.cpp
+++ b/clientscr/screensaver_win.cpp
@@ -311,16 +311,6 @@ INT CScreensaver::Run() {
DoConfig();
}
break;
-
- case sm_test:
-
- int iCurrentStatus;
- rpc.init(NULL);
- rpc.get_screensaver_mode(iCurrentStatus);
- rpc.close();
-
- break;
-
case sm_preview:
case sm_full:
// Create the data management thread to talk with the daemon
diff --git a/win_build/boinc_cli_curl.vcproj b/win_build/boinc_cli_curl.vcproj
index d184c71304..69b129f358 100644
--- a/win_build/boinc_cli_curl.vcproj
+++ b/win_build/boinc_cli_curl.vcproj
@@ -2106,80 +2106,6 @@
/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -2383,10 +2309,6 @@
RelativePath="..\client\scheduler_op.h"
>
-
-