From 42b3ead5f04005e975b9157d25aa0a60cd4aba4d Mon Sep 17 00:00:00 2001
From: Heiko Hund <heikoh@users.sf.net>
Date: Thu, 21 Jul 2011 09:01:04 +0200
Subject: [PATCH] fix symbol clash

---
 options.h | 2 +-
 proxy.c   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/options.h b/options.h
index 82bb847..d314aaa 100644
--- a/options.h
+++ b/options.h
@@ -87,7 +87,7 @@ typedef enum {
 
 typedef enum {
     config,
-    system,
+    windows,
     manual
 } proxy_source_t;
 
diff --git a/proxy.c b/proxy.c
index 076f276..ce2a57e 100644
--- a/proxy.c
+++ b/proxy.c
@@ -201,7 +201,7 @@ LoadProxySettings(HWND hwndDlg)
     {
         SendMessage(GetDlgItem(hwndDlg, ID_RB_PROXY_OPENVPN), BM_CLICK, 0, 0);
     }
-    else if (o.proxy_source == system)
+    else if (o.proxy_source == windows)
     {
         SendMessage(GetDlgItem(hwndDlg, ID_RB_PROXY_MSIE), BM_CLICK, 0, 0);
     }
@@ -228,7 +228,7 @@ SaveProxySettings(HWND hwndDlg)
     }
     else if (IsDlgButtonChecked(hwndDlg, ID_RB_PROXY_MSIE) == BST_CHECKED)
     {
-        o.proxy_source = system;
+        o.proxy_source = windows;
         proxy_source_string[0] = _T('1');
     }
     else if (IsDlgButtonChecked(hwndDlg, ID_RB_PROXY_MANUAL) == BST_CHECKED)
@@ -307,7 +307,7 @@ GetProxyRegistrySettings()
     }
     else if (proxy_source_string[0] == _T('1'))
     {
-        o.proxy_source = system;
+        o.proxy_source = windows;
     }
     else if (proxy_source_string[0] == _T('2'))
     {
@@ -396,7 +396,7 @@ void ConstructProxyCmdLine(TCHAR *proxy_string, unsigned int size)
                           o.proxy_socks_address, o.proxy_socks_port);
         }
     }
-    else if (o.proxy_source == system)
+    else if (o.proxy_source == windows)
     {
         __sntprintf_0(proxy_string, size, _T(" --auto-proxy"));
     }