From 67d62d77b654765dcec9c13f114db93d1d9c2641 Mon Sep 17 00:00:00 2001 From: Charlie Fenton Date: Tue, 11 Mar 2008 05:31:07 +0000 Subject: [PATCH] Client: Fix build breaks and compiler warnings on Mac svn path=/trunk/boinc/; revision=14889 --- checkin_notes | 3 +++ clientgui/ViewProjectsGrid.cpp | 2 +- clientgui/ViewWorkGrid.cpp | 2 +- lib/coproc.C | 4 +++- lib/util.C | 1 + 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/checkin_notes b/checkin_notes index b72a186add..5b933a75c8 100644 --- a/checkin_notes +++ b/checkin_notes @@ -2219,8 +2219,11 @@ Charlie Mar 10 2008 cs_statefile.C clientgui/ MainDocument.cpp + ViewProjectsGrid.cpp + ViewWorkGrid.cpp lib/ coproc.C + util.C mac_build/ boinc.xcodeproj/ project.pbxproj diff --git a/clientgui/ViewProjectsGrid.cpp b/clientgui/ViewProjectsGrid.cpp index 28d1aed7b4..8bc209d744 100644 --- a/clientgui/ViewProjectsGrid.cpp +++ b/clientgui/ViewProjectsGrid.cpp @@ -504,7 +504,7 @@ void CViewProjectsGrid::UpdateSelection() { PROJECT* project = NULL; CMainDocument* pDoc = wxGetApp().GetDocument(); int i, n; - bool wasSuspended, wasNoNewWork; + bool wasSuspended=false, wasNoNewWork=false; wxASSERT(pDoc); wxASSERT(wxDynamicCast(pDoc, CMainDocument)); diff --git a/clientgui/ViewWorkGrid.cpp b/clientgui/ViewWorkGrid.cpp index 9651cc7149..741b4833bb 100644 --- a/clientgui/ViewWorkGrid.cpp +++ b/clientgui/ViewWorkGrid.cpp @@ -409,7 +409,7 @@ void CViewWorkGrid::UpdateSelection() { PROJECT* project = NULL; CMainDocument* pDoc = wxGetApp().GetDocument(); int i, n; - bool wasSuspended, all_same_project=false; + bool wasSuspended=false, all_same_project=false; string first_project_url; wxASSERT(NULL != pDoc); diff --git a/lib/coproc.C b/lib/coproc.C index 86966d4571..d0cd638ffa 100644 --- a/lib/coproc.C +++ b/lib/coproc.C @@ -21,6 +21,7 @@ #include #include #ifdef _WIN32 +#elif defined(__APPLE__) #else #include #endif @@ -62,7 +63,8 @@ void COPROC_CUDA::get(COPROCS& coprocs) { if(!__cudaGetDeviceCount) return; __cudaGetDeviceProperties = (void(*)(cudaDeviceProp*, int)) GetProcAddress( cudalib, "cudaGetDeviceProperties" ); if (!__cudaGetDeviceProperties) return; - +#elif defined(__APPLE__) + return; #else void *cudalib = dlopen ("libcudart.so", RTLD_NOW ); if(!cudalib) return; diff --git a/lib/util.C b/lib/util.C index d26b6f8f78..1d209f9939 100644 --- a/lib/util.C +++ b/lib/util.C @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include