From 5c9835ea2bb744536f45f67752d3c55dae65fcf1 Mon Sep 17 00:00:00 2001 From: "dominique.leuenberger@gmail.com" Date: Tue, 27 Aug 2013 18:29:47 +0000 Subject: Fix Build on Mac OS X - Fixes bug 183 git-svn-id: http://libproxy.googlecode.com/svn/trunk@879 c587cffe-e639-0410-9787-d7902ae8ed56 --- NEWS | 3 ++- libproxy/modules/config_macosx.cpp | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index ec416da..d9adc32 100644 --- a/NEWS +++ b/NEWS @@ -5,7 +5,8 @@ New in version * 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 index 1c43000..38e4065 100644 --- 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 get_config(const url &url) throw (runtime_error) { + vector get_config(const url &the_url) throw (runtime_error) { string tmp; CFDictionaryRef proxies = SCDynamicStoreCopyProxies(NULL); vector response; @@ -136,8 +136,8 @@ public: } // 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); -- cgit v1.2.1