diff --git a/api/boinc_api.cpp b/api/boinc_api.cpp index 63f14e9d94..9f875154e2 100644 --- a/api/boinc_api.cpp +++ b/api/boinc_api.cpp @@ -203,7 +203,11 @@ char* boinc_msg_prefix(char* sbuf, int len) { strcpy(sbuf, "time() failed"); return sbuf; } +#ifdef _WIN32 + if (localtime_s(&tm, &x) == EINVAL) { +#else if (localtime_r(&x, &tm) == NULL) { +#endif strcpy(sbuf, "localtime() failed"); return sbuf; } diff --git a/checkin_notes b/checkin_notes index f654e3f175..0659979d79 100644 --- a/checkin_notes +++ b/checkin_notes @@ -8609,3 +8609,12 @@ David 2 Dec 2010 client/ rr_sim.cpp + +David 2 Dec 2010 + - client: fix typo that broke communication with account managers + - API: compile fix for Win + + client/ + acct_mgr.cpp + api/ + boinc_api.cpp diff --git a/client/acct_mgr.cpp b/client/acct_mgr.cpp index 4d82303b17..483819b86b 100644 --- a/client/acct_mgr.cpp +++ b/client/acct_mgr.cpp @@ -151,10 +151,10 @@ int ACCT_MGR_OP::do_rpc( " %d\n" " %f\n" " %f\n" - " %d\n" - " %d\n" - " %d\n" - " %d\n" + " %d\n" + " %d\n" + " %d\n" + " %d\n" " \n", p->master_url, p->project_name,