Fix Build on Mac OS X - Fixes bug 183

libproxy · Aug 27, 2013 · 25cc320 · 25cc320
1 parent 6bcc831
commit 25cc320
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/NEWS b/NEWS
@@ -5,7 +5,8 @@ New in version <NEXT>
 * Fix linking of perl bindings to pthread (Bug #182)
 * Correctly detect spidermonky (mozjs185) (Bug #188)
 * Stop pxgsettings from segfaulting on exit (Bug #192)
-* Fix test #10 (Bug 189)
+* Fix test #10 (Bug #189)
+* Fix build on Mac OS X (Bug #183)
 
 New in version 0.4.11
 ==============================

diff --git a/libproxy/modules/config_macosx.cpp b/libproxy/modules/config_macosx.cpp
@@ -114,7 +114,7 @@ static string capitalize(string str) {
 
 class macosx_config_extension : public config_extension {
 public:
-	vector<url> get_config(const url &url) throw (runtime_error) {
+	vector<url> get_config(const url &the_url) throw (runtime_error) {
 		string tmp;
 		CFDictionaryRef proxies = SCDynamicStoreCopyProxies(NULL);
 		vector<url> response;
@@ -136,8 +136,8 @@ class macosx_config_extension : public config_extension {
 		}
 
 		// http:// or socks:// (TODO: gopher:// and rtsp:// ???)
-		else if ((protocol_url(proxies, toupper(url.get_scheme()), tmp)    && url::is_valid(tmp)) ||
-		    (protocol_url(proxies, capitalize(url.get_scheme()), tmp) && url::is_valid(tmp)) ||
+		else if ((protocol_url(proxies, toupper(the_url.get_scheme()), tmp)    && url::is_valid(tmp)) ||
+		    (protocol_url(proxies, capitalize(the_url.get_scheme()), tmp) && url::is_valid(tmp)) ||
 		    (protocol_url(proxies, toupper("http"), tmp)              && url::is_valid(tmp)) ||
 	            (protocol_url(proxies, toupper("socks"), tmp)             && url::is_valid(tmp))) {
 			CFRelease(proxies);