From 75e86bff040256f074c440f76f73d061b8aa59b3 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Tue, 1 Jun 2010 18:36:11 +0000
Subject: [PATCH] - client/server/API: rename cudaDeviceProp to
 CUDA_DEVICE_PROP to     avoid conflict with nvidia's structure.     Note:
 these structures don't have to be the same,     since we populate our struct
 one item at a time.

svn path=/trunk/boinc/; revision=21668
---
 checkin_notes | 10 ++++++++++
 lib/coproc.h  |  7 ++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 70a2274ec7..4d9935e4bd 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -3929,3 +3929,13 @@ Rytis  1 Jun 2010
 
     html/inc/
         user.inc
+
+David  1 Jun 2010
+    - client/server/API: rename cudaDeviceProp to CUDA_DEVICE_PROP to
+        avoid conflict with nvidia's structure.
+        Note: these structures don't have to be the same,
+        since we populate our struct one item at a time.
+
+    lib/
+        coproc.h
+
diff --git a/lib/coproc.h b/lib/coproc.h
index beb764b377..332698c929 100644
--- a/lib/coproc.h
+++ b/lib/coproc.h
@@ -162,9 +162,10 @@ struct COPROC {
     void print_available_ram();
 };
 
-// the following copied from /usr/local/cuda/include/driver_types.h
+// based on cudaDeviceProp from /usr/local/cuda/include/driver_types.h
+// doesn't have to match exactly since we get the attributes one at a time.
 //
-struct cudaDeviceProp {
+struct CUDA_DEVICE_PROP {
   char   name[256];
   unsigned int totalGlobalMem;
     // not used on the server; dtotalGlobalMem is used instead
@@ -189,7 +190,7 @@ struct cudaDeviceProp {
 struct COPROC_CUDA : public COPROC {
     int cuda_version;  // CUDA runtime version
     int display_driver_version;
-    cudaDeviceProp prop;
+    CUDA_DEVICE_PROP prop;
 
 #ifndef _USING_FCGI_
     virtual void write_xml(MIOFILE&);