From 4eb7097653ae15c27ec178425a6056067511cf5d Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Sat, 15 Aug 2009 00:12:51 +0000
Subject: [PATCH] compile fixes

svn path=/trunk/boinc/; revision=18848
---
 lib/coproc.cpp | 17 ++++++++---------
 lib/coproc.h   |  1 +
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/coproc.cpp b/lib/coproc.cpp
index a9ece035a4..6786fdaf26 100644
--- a/lib/coproc.cpp
+++ b/lib/coproc.cpp
@@ -39,7 +39,6 @@
 #include "filesys.h"
 #include "parse.h"
 #include "str_util.h"
-#include "cal.h"
 
 #include "coproc.h"
 
@@ -586,14 +585,15 @@ void COPROC_CAL::get(COPROCS& coprocs, vector<string>& strings) {
     }
 #endif
     if (!callib) {
-        return "No CAL Runtime Libraries installed.";
+        strings.push_back("No CAL Runtime Libraries installed.");
+        return;
     }
-    __calInit = (PCGDI)GetProcAddress(callib2, "calInit" );
-    __calDeviceGetCount = (PCGDC)GetProcAddress(callib2, "calDeviceGetCount" );
-    __calGetVersion = (VER)GetProcAddress(callib2, "calGetVersion" );
-    __calDeviceGetInfo = (INFO)GetProcAddress(callib2, "calDeviceGetInfo" );
-    __calDeviceGetAttribs =(ATTRIBS)GetProcAddress(callib2, "calDeviceGetAttribs" );
-    __calShutdown = (CLOSE)GetProcAddress(callib2, "calShutdown" );
+    __calInit = (PCGDI)GetProcAddress(callib, "calInit" );
+    __calDeviceGetCount = (PCGDC)GetProcAddress(callib, "calDeviceGetCount" );
+    __calGetVersion = (VER)GetProcAddress(callib, "calGetVersion" );
+    __calDeviceGetInfo = (INFO)GetProcAddress(callib, "calDeviceGetInfo" );
+    __calDeviceGetAttribs =(ATTRIBS)GetProcAddress(callib, "calDeviceGetAttribs" );
+    __calShutdown = (CLOSE)GetProcAddress(callib, "calShutdown" );
 #else
     void* callib;
     int (*__calInit)();
@@ -663,7 +663,6 @@ void COPROC_CAL::get(COPROCS& coprocs, vector<string>& strings) {
     COPROC_CAL* ccp = new COPROC_CAL;
     *ccp = cc2;
     real_count = numDevices;
-    char buffer[50];
     sprintf(ccp->version, "%d.%d.%d", cal_major, cal_minor, cal_imp);
     strcpy(ccp->type, "CAL");
     ccp->count = numDevices;
diff --git a/lib/coproc.h b/lib/coproc.h
index 024a3aec93..28399f2d2b 100644
--- a/lib/coproc.h
+++ b/lib/coproc.h
@@ -71,6 +71,7 @@
 #endif
 
 #include "miofile.h"
+#include "cal.h"
 
 #define MAX_COPROC_INSTANCES 64