diff options
| author | dominique.leuenberger@gmail.com <dominique.leuenberger@gmail.com@c587cffe-e639-0410-9787-d7902ae8ed56> | 2013-08-27 18:29:47 +0000 |
|---|---|---|
| committer | dominique.leuenberger@gmail.com <dominique.leuenberger@gmail.com@c587cffe-e639-0410-9787-d7902ae8ed56> | 2013-08-27 18:29:47 +0000 |
| commit | 5c9835ea2bb744536f45f67752d3c55dae65fcf1 (patch) | |
| tree | 0d3f2999bff397ba6e855c72a2a2bf1083989ac3 | |
| parent | f3e4cfe21e3dffbf416ecb21d7ddd353b026542b (diff) | |
| download | libproxy-5c9835ea2bb744536f45f67752d3c55dae65fcf1.tar.gz | |
Fix Build on Mac OS X - Fixes bug 183
git-svn-id: http://libproxy.googlecode.com/svn/trunk@879 c587cffe-e639-0410-9787-d7902ae8ed56
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | libproxy/modules/config_macosx.cpp | 6 |
2 files changed, 5 insertions, 4 deletions
@@ -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 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<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 @@ 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); |