diff --git a/checkin_notes b/checkin_notes
index 34f1d96225..300bde482a 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -2202,3 +2202,19 @@ David  Mar 10 2008
         Makefile.mingw
     lilb/
         proc_control.h
+
+Charlie Mar 10 2008
+    - Client: Rework write_state_file logic to always retry if there is an 
+        error writing or renaming the state file, and to show warning messages 
+        Can't rename / can't write state file only if it failed all retries or 
+        if the state_debug log flag is set.  These messages have appeared from 
+        time to time and worry users, but they never seemed to signal any real 
+        problems, probably because the subsequent retry succeeded.       
+    - Client: Fix build breaks and compiler warnings on Mac.
+    
+    client/
+        app_start.C
+        client_state.C
+        cs_statefile.C
+    lib/
+        coproc.C
diff --git a/client/app_start.C b/client/app_start.C
index 343f133079..bb77439aa1 100644
--- a/client/app_start.C
+++ b/client/app_start.C
@@ -70,7 +70,10 @@ using std::vector;
 #include "file_names.h"
 #include "base64.h"
 #include "sandbox.h"
+
+#ifdef _WIN32
 #include "proc_control.h"
+#endif
 
 #include "app.h"
 
diff --git a/client/client_state.C b/client/client_state.C
index 20af5b6ba4..98b4dd3f64 100644
--- a/client/client_state.C
+++ b/client/client_state.C
@@ -594,20 +594,9 @@ bool CLIENT_STATE::poll_slow_events() {
     retval = write_state_file_if_needed();
     if (retval) {
         msg_printf(NULL, MSG_INTERNAL_ERROR,
-            "Couldn't write state file: %s", boincerror(retval)
+            "Couldn't write state file: %s; giving up", boincerror(retval)
         );
-        boinc_sleep(1.0);
-
-        // if we can't write the state file twice in a row, something's hosed;
-        // better to not keep trying
-        //
-        retval = write_state_file_if_needed();
-        if (retval) {
-            msg_printf(NULL, MSG_INTERNAL_ERROR,
-                "Couldn't write state file: %s; giving up", boincerror(retval)
-            );
-            exit(EXIT_STATEFILE_WRITE);
-        }
+        exit(EXIT_STATEFILE_WRITE);
     }
     if (log_flags.poll_debug) {
         msg_printf(0, MSG_INFO,
diff --git a/client/cs_statefile.C b/client/cs_statefile.C
index 313e28df62..61530ebbf5 100644
--- a/client/cs_statefile.C
+++ b/client/cs_statefile.C
@@ -36,6 +36,8 @@
 #include <cerrno>
 #endif
 
+#define MAX_STATE_FILE_WRITE_ATTEMPTS 2
+
 void CLIENT_STATE::set_client_state_dirty(const char* source) {
     if (log_flags.state_debug) {
         msg_printf(0, MSG_INFO, "[state_debug] set dirty: %s\n", source);
@@ -464,103 +466,132 @@ int CLIENT_STATE::parse_state_file() {
 //
 int CLIENT_STATE::write_state_file() {
     MFILE mf;
-    int retval, ret1, ret2;
+    int retval, ret1, ret2, attempt;
 #ifdef _WIN32
     char win_error_msg[4096];
 #endif
 
-    if (log_flags.state_debug) {
-        msg_printf(0, MSG_INFO,
-            "[status_debug] CLIENT_STATE::write_state_file(): Writing state file"
-        );
-    }
+    for (attempt=1; attempt<=MAX_STATE_FILE_WRITE_ATTEMPTS; attempt++) {
+        if (attempt > 1) boinc_sleep(1.0);
+            
+        if (log_flags.state_debug) {
+            msg_printf(0, MSG_INFO,
+                "[status_debug] CLIENT_STATE::write_state_file(): Writing state file"
+            );
+        }
 #ifdef _WIN32
-    retval = mf.open(STATE_FILE_NEXT, "wc");
+        retval = mf.open(STATE_FILE_NEXT, "wc");
 #else
-    retval = mf.open(STATE_FILE_NEXT, "w");
+        retval = mf.open(STATE_FILE_NEXT, "w");
 #endif
-    if (retval) {
-        msg_printf(0, MSG_INTERNAL_ERROR,
-            "Can't open %s: %s",
-            STATE_FILE_NEXT, boincerror(retval)
-        );
-        return ERR_FOPEN;
-    }
-    MIOFILE miof;
-    miof.init_mfile(&mf);
-    ret1 = write_state(miof);
-    ret2 = mf.close();
-    if (ret1) return ret1;
-    if (ret2) return ret2;
-
-    // only attempt to rename the current state file if it exists.
-    //
-    if (boinc_file_exists(STATE_FILE_NAME)) {
-        if (boinc_file_exists(STATE_FILE_PREV)) {
-            retval = boinc_delete_file(STATE_FILE_PREV);
-#ifdef _WIN32
-            if (retval) {
-                msg_printf(0, MSG_USER_ERROR,
-                    "Can't delete previous state file; %s",
-                    windows_error_string(win_error_msg, sizeof(win_error_msg))
+        if (retval) {
+            if ((attempt == MAX_STATE_FILE_WRITE_ATTEMPTS) || log_flags.state_debug) {
+                msg_printf(0, MSG_INTERNAL_ERROR,
+                    "Can't open %s: %s",
+                    STATE_FILE_NEXT, boincerror(retval)
                 );
             }
-#endif
+            if (attempt < MAX_STATE_FILE_WRITE_ATTEMPTS) continue;
+            return ERR_FOPEN;
         }
-        
-        retval = boinc_rename(STATE_FILE_NAME, STATE_FILE_PREV);
-#ifdef _WIN32
-        if (retval) {
-            msg_printf(0, MSG_USER_ERROR,
-                "Can't rename current state file to previous state file; %s",
-                windows_error_string(win_error_msg, sizeof(win_error_msg))
-            );
+        MIOFILE miof;
+        miof.init_mfile(&mf);
+        ret1 = write_state(miof);
+        ret2 = mf.close();
+        if (ret1) {
+            if ((attempt == MAX_STATE_FILE_WRITE_ATTEMPTS) || log_flags.state_debug) {
+                msg_printf(NULL, MSG_INTERNAL_ERROR,
+                    "Couldn't write state file: %s", boincerror(retval)
+                );
+            }
+            if (attempt < MAX_STATE_FILE_WRITE_ATTEMPTS) continue;
+            return ret1;
         }
-#endif
-#ifdef __APPLE__
-        if (retval) {
-            msg_printf(0, MSG_USER_ERROR, 
-                "rename current state file to previous state file returned error %d: %s", 
-                errno, strerror(errno)
-            );
+        if (ret2) {
+            if (attempt < MAX_STATE_FILE_WRITE_ATTEMPTS) continue;
+            return ret2;
         }
-#endif
-    }
 
-    retval = boinc_rename(STATE_FILE_NEXT, STATE_FILE_NAME);
-    if (log_flags.state_debug) {
-        msg_printf(0, MSG_INFO,
-            "[status_debug] CLIENT_STATE::write_state_file(): Done writing state file"
-        );
-    }
-    if (retval) {
+        // only attempt to rename the current state file if it exists.
+        //
+        if (boinc_file_exists(STATE_FILE_NAME)) {
+            if (boinc_file_exists(STATE_FILE_PREV)) {
+                retval = boinc_delete_file(STATE_FILE_PREV);
+                if (retval) {
+                    if ((attempt == MAX_STATE_FILE_WRITE_ATTEMPTS) || log_flags.state_debug) {
 #ifdef _WIN32
-        if (retval == ERROR_ACCESS_DENIED) {
-            msg_printf(0, MSG_USER_ERROR,
-                "Can't rename state file; access denied; check file and directory permissions"
-            );
-        } else {
-            msg_printf(0, MSG_USER_ERROR,
-                "Can't rename state file; %s",
-                windows_error_string(win_error_msg, sizeof(win_error_msg))
-            );
-        }
+                        msg_printf(0, MSG_USER_ERROR,
+                            "Can't delete previous state file; %s",
+                            windows_error_string(win_error_msg, sizeof(win_error_msg))
+                        );
 #else
-        msg_printf(0, MSG_USER_ERROR,
-            "Can't rename %s to %s; check file and directory permissions",
-            STATE_FILE_NEXT, STATE_FILE_NAME
-        );
+                        msg_printf(0, MSG_USER_ERROR,
+                            "Can't delete previous state file; error %d: %s",
+                            errno, strerror(errno)
+                        );
 #endif
-#ifdef __APPLE__
-        msg_printf(0, MSG_USER_ERROR, 
-            "rename %s to %s returned error %d: %s", 
-            STATE_FILE_NEXT, STATE_FILE_NAME, errno, strerror(errno)
-        );
-        if (log_flags.state_debug) {
-            system("ls -al /Library/Application\\ Support/BOINC\\ Data/client*.*");
+                    }
+                    if (attempt < MAX_STATE_FILE_WRITE_ATTEMPTS) continue;
+                }
+            }
         }
+            
+        retval = boinc_rename(STATE_FILE_NAME, STATE_FILE_PREV);
+        if (retval) {
+            if ((attempt == MAX_STATE_FILE_WRITE_ATTEMPTS) || log_flags.state_debug) {
+#ifdef _WIN32
+                msg_printf(0, MSG_USER_ERROR,
+                    "Can't rename current state file to previous state file; %s",
+                    windows_error_string(win_error_msg, sizeof(win_error_msg))
+                );
+#else
+                msg_printf(0, MSG_USER_ERROR, 
+                    "rename current state file to previous state file returned error %d: %s", 
+                    errno, strerror(errno)
+                );
 #endif
-        return ERR_RENAME;
+            }
+            if (attempt < MAX_STATE_FILE_WRITE_ATTEMPTS) continue;
+        }
+
+        retval = boinc_rename(STATE_FILE_NEXT, STATE_FILE_NAME);
+        if (log_flags.state_debug) {
+            msg_printf(0, MSG_INFO,
+                "[status_debug] CLIENT_STATE::write_state_file(): Done writing state file"
+            );
+        }
+        if (retval) {
+             if ((attempt == MAX_STATE_FILE_WRITE_ATTEMPTS) || log_flags.state_debug) {
+#ifdef _WIN32
+                if (retval == ERROR_ACCESS_DENIED) {
+                    msg_printf(0, MSG_USER_ERROR,
+                        "Can't rename state file; access denied; check file and directory permissions"
+                    );
+                } else {
+                    msg_printf(0, MSG_USER_ERROR,
+                        "Can't rename state file; %s",
+                        windows_error_string(win_error_msg, sizeof(win_error_msg))
+                    );
+                }
+#elif defined (__APPLE__)
+                msg_printf(0, MSG_USER_ERROR, 
+                    "Can't rename %s to %s; check file and directory permissions\n"
+                    "rename returned error %d: %s", 
+                    STATE_FILE_NEXT, STATE_FILE_NAME, errno, strerror(errno)
+                );
+                if (log_flags.state_debug) {
+                    system("ls -al /Library/Application\\ Support/BOINC\\ Data/client*.*");
+                }
+#else
+            msg_printf(0, MSG_USER_ERROR,
+                "Can't rename %s to %s; check file and directory permissions",
+                STATE_FILE_NEXT, STATE_FILE_NAME
+            );
+#endif
+            }
+            if (attempt < MAX_STATE_FILE_WRITE_ATTEMPTS) continue;
+            return ERR_RENAME;
+        }
     }
     return 0;
 }
diff --git a/lib/coproc.C b/lib/coproc.C
index 666d6b35e5..86966d4571 100644
--- a/lib/coproc.C
+++ b/lib/coproc.C
@@ -103,19 +103,19 @@ void COPROC_CUDA::write_xml(FILE* f) {
         "   <textureAlignment>%u</textureAlignment>\n",
         count,
         prop.name,
-        prop.totalGlobalMem,
-        prop.sharedMemPerBlock,
+        (unsigned int)prop.totalGlobalMem,
+        (unsigned int)prop.sharedMemPerBlock,
         prop.regsPerBlock,
         prop.warpSize,
-        prop.memPitch,
+        (unsigned int)prop.memPitch,
         prop.maxThreadsPerBlock,
         prop.maxThreadsDim[0], prop.maxThreadsDim[1], prop.maxThreadsDim[2],
         prop.maxGridSize[0], prop.maxGridSize[1], prop.maxGridSize[2],
-        prop.totalConstMem,
+        (unsigned int)prop.totalConstMem,
         prop.major,
         prop.minor,
         prop.clockRate,
-        prop.textureAlignment
+        (unsigned int)prop.textureAlignment
     );
 }