X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a03c55c13c674ea6f8489b764d5414a4979b348b..d896a793a01cf7dc02ed04dcadb51591438eb32f:/src/common/url.cpp diff --git a/src/common/url.cpp b/src/common/url.cpp index 192c68fd3b..e265e0c5f3 100644 --- a/src/common/url.cpp +++ b/src/common/url.cpp @@ -9,7 +9,7 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "url.h" #endif @@ -272,8 +272,6 @@ bool wxURL::FetchProtocol() wxInputStream *wxURL::GetInputStream() { - wxInputStream *the_i_stream = NULL; - if (!m_protocol) { m_error = wxURL_NOPROTO; @@ -310,10 +308,9 @@ wxInputStream *wxURL::GetInputStream() #endif // When we use a proxy, we have to pass the whole URL to it. - if (m_useProxy) - the_i_stream = m_protocol->GetInputStream(m_url); - else - the_i_stream = m_protocol->GetInputStream(m_path); + wxInputStream *the_i_stream = + (m_useProxy) ? m_protocol->GetInputStream(m_url) : + m_protocol->GetInputStream(m_path); if (!the_i_stream) {