From eebec1c63c1cbb43091050f49b7d1f53eec4ad28 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Thu, 8 May 2014 01:05:11 -0700
Subject: [PATCH] Manager: compile fixes

---
 clientgui/AsyncRPC.cpp            | 4 ++--
 clientgui/AsyncRPC.h              | 4 ++--
 clientgui/DlgAdvPreferences.h     | 2 +-
 clientgui/DlgDiagnosticLogFlags.h | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/clientgui/AsyncRPC.cpp b/clientgui/AsyncRPC.cpp
index 16884ac582..dc50edb858 100644
--- a/clientgui/AsyncRPC.cpp
+++ b/clientgui/AsyncRPC.cpp
@@ -444,13 +444,13 @@ int RPCThread::ProcessRPCRequest() {
         break;
     case RPC_GET_CC_CONFIG:
          retval = (m_pDoc->rpcClient).get_cc_config(
-            *(CONFIG*)(current_request->arg1),
+            *(CC_CONFIG*)(current_request->arg1),
             *(LOG_FLAGS*)(current_request->arg2)
         );
         break;
     case RPC_SET_CC_CONFIG:
          retval = (m_pDoc->rpcClient).set_cc_config(
-            *(CONFIG*)(current_request->arg1),
+            *(CC_CONFIG*)(current_request->arg1),
             *(LOG_FLAGS*)(current_request->arg2)
         );
         break;
diff --git a/clientgui/AsyncRPC.h b/clientgui/AsyncRPC.h
index 5c90bbdeab..2fe79ccce8 100644
--- a/clientgui/AsyncRPC.h
+++ b/clientgui/AsyncRPC.h
@@ -339,9 +339,9 @@ public:
             { return RPC_Wait(RPC_GET_GLOBAL_PREFS_OVERRIDE_STRUCT, (void*)&arg1, (void*)&arg2); }
     int set_global_prefs_override_struct(GLOBAL_PREFS& arg1, GLOBAL_PREFS_MASK& arg2)
             { return RPC_Wait(RPC_SET_GLOBAL_PREFS_OVERRIDE_STRUCT, (void*)&arg1, (void*)&arg2); }
-    int get_cc_config(CONFIG& arg1, LOG_FLAGS& arg2)
+    int get_cc_config(CC_CONFIG& arg1, LOG_FLAGS& arg2)
             { return RPC_Wait(RPC_GET_CC_CONFIG, (void*)&arg1, (void*)&arg2); }
-    int set_cc_config(CONFIG& arg1, LOG_FLAGS& arg2)
+    int set_cc_config(CC_CONFIG& arg1, LOG_FLAGS& arg2)
             { return RPC_Wait(RPC_SET_CC_CONFIG, (void*)&arg1, (void*)&arg2); }
 private:
     CMainDocument*              m_pDoc;
diff --git a/clientgui/DlgAdvPreferences.h b/clientgui/DlgAdvPreferences.h
index 5b13a12170..757bc71d5b 100644
--- a/clientgui/DlgAdvPreferences.h
+++ b/clientgui/DlgAdvPreferences.h
@@ -69,7 +69,7 @@ private:
     GLOBAL_PREFS      prefs;
     GLOBAL_PREFS_MASK mask;
     LOG_FLAGS log_flags;
-    CONFIG config;
+    CC_CONFIG config;
 	bool m_bExclusiveAppsDataChanged;
 	bool m_bPrefsDataChanged;
 	bool m_bInInit;
diff --git a/clientgui/DlgDiagnosticLogFlags.h b/clientgui/DlgDiagnosticLogFlags.h
index 487c8b0c0f..54f5a9c53c 100755
--- a/clientgui/DlgDiagnosticLogFlags.h
+++ b/clientgui/DlgDiagnosticLogFlags.h
@@ -57,7 +57,7 @@ private:
     void CreateCheckboxes();
     
     LOG_FLAGS           log_flags;
-    CONFIG              config;
+    CC_CONFIG              config;
     
     wxGridSizer*        m_headingSizer;
     std::vector <wxCheckBox*> m_checkbox_list;