From bc69fe301da6544c29de0c4fb48c237334afbd03 Mon Sep 17 00:00:00 2001
From: Charlie Fenton <charlief@example.com>
Date: Mon, 10 Dec 2012 04:59:06 -0800
Subject: [PATCH] Restore changes lost due to GIT confusion

---
 lib/cc_config.h |  4 +---
 lib/coproc.h    | 10 ++++------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/lib/cc_config.h b/lib/cc_config.h
index 3b1187acbd..dbdbe087b1 100644
--- a/lib/cc_config.h
+++ b/lib/cc_config.h
@@ -155,9 +155,7 @@ struct CONFIG {
     bool http_1_0;
     int http_transfer_timeout_bps;
     int http_transfer_timeout;
-    std::vector<int> ignore_ati_dev;
-    std::vector<int> ignore_nvidia_dev;
-    std::vector<int> ignore_intel_dev;
+    std::vector<int> ignore_gpu_instance[NPROC_TYPES];
     int max_file_xfers;
     int max_file_xfers_per_project;
     int max_stderr_file_size;
diff --git a/lib/coproc.h b/lib/coproc.h
index de6c4137ec..29fc2067d8 100644
--- a/lib/coproc.h
+++ b/lib/coproc.h
@@ -398,6 +398,8 @@ struct COPROC_INTEL : public COPROC {
     void fake(double ram, double avail_ram, int);
 };
 
+typedef std::vector<int> IGNORE_GPU_INSTANCE[NPROC_TYPES];
+
 struct COPROCS {
     int n_rsc;
     COPROC coprocs[MAX_RSC];
@@ -410,16 +412,12 @@ struct COPROCS {
         bool use_all, 
         std::vector<std::string> &descs,
         std::vector<std::string> &warnings,
-        std::vector<int>& ignore_nvidia_dev,
-        std::vector<int>& ignore_ati_dev,
-        std::vector<int>& ignore_intel_gpu_dev
+        IGNORE_GPU_INSTANCE &ignore_gpu_instance
     );
     void get_opencl(
         bool use_all, 
         std::vector<std::string> &warnings,
-        std::vector<int>& ignore_nvidia_dev, 
-        std::vector<int>& ignore_ati_dev,
-        std::vector<int>& ignore_intel_gpu_dev
+        IGNORE_GPU_INSTANCE &ignore_gpu_instance
     );
     cl_int get_opencl_info(
         OPENCL_DEVICE_PROP& prop,