Windows API name collision fix

ivan386 · Oct 30, 2013 · 985dfbe · 985dfbe
1 parent 91592fb
commit 985dfbe
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/shareaza/BitziDownloader.cpp b/shareaza/BitziDownloader.cpp
@@ -83,7 +83,7 @@ BOOL CBitziDownloader::Start(CBitziDownloadDlg* pDlg)
 {
 	if ( m_hInternet != NULL ) return FALSE;
 
-	m_hInternet = CNetwork::InternetOpen();
+	m_hInternet = CNetwork::CNInternetOpen();
 	if ( ! m_hInternet ) return FALSE;
 
 	m_hSession	= NULL;

diff --git a/shareaza/HttpRequest.cpp b/shareaza/HttpRequest.cpp
@@ -248,10 +248,10 @@ void CHttpRequest::OnRun()
 	ASSERT( m_sURL.GetLength() );
 	ASSERT( m_pResponse == NULL );
 
-	m_hInternet = CNetwork::InternetOpen();
+	m_hInternet = CNetwork::CNInternetOpen();
 	if ( m_hInternet )
 	{
-		HINTERNET hURL = CNetwork::InternetOpenUrl( m_hInternet, m_sURL,
+		HINTERNET hURL = CNetwork::CNInternetOpenUrl( m_hInternet, m_sURL,
 			m_sRequestHeaders, m_sRequestHeaders.GetLength(),
 			INTERNET_FLAG_KEEP_CONNECTION | INTERNET_FLAG_RELOAD |
 			INTERNET_FLAG_PRAGMA_NOCACHE | INTERNET_FLAG_NO_CACHE_WRITE |

diff --git a/shareaza/Network.cpp b/shareaza/Network.cpp
@@ -222,7 +222,7 @@ BOOL CNetwork::IsSelfIP(const IN_ADDR& nAddress) const
 	return ( m_pHostAddresses.Find( nAddress.s_addr ) != NULL );
 }
 
-HINTERNET CNetwork::InternetOpen()
+HINTERNET CNetwork::CNInternetOpen()
 {
 	__try
 	{
@@ -236,7 +236,7 @@ HINTERNET CNetwork::InternetOpen()
 	return NULL;
 }
 
-bool CNetwork::InternetConnect()
+bool CNetwork::CNInternetConnect()
 {
 	__try
 	{
@@ -713,7 +713,7 @@ bool CNetwork::PreRun()
 	if ( Settings.Connection.ForceConnectedState )
 	{
 		INTERNET_CONNECTED_INFO ici = {};
-		HINTERNET hInternet = InternetOpen();
+		HINTERNET hInternet = CNInternetOpen();
 
 		ici.dwConnectedState = INTERNET_STATE_CONNECTED;
 		InternetSetOption( hInternet, INTERNET_OPTION_CONNECTED_STATE, &ici, sizeof(ici) );
@@ -1450,7 +1450,7 @@ int CNetwork::RecvFrom(SOCKET s, char* buf, int len, SOCKADDR_IN* pFrom)
 	}
 }
 
-HINTERNET CNetwork::InternetOpenUrl(HINTERNET hInternet, LPCWSTR lpszUrl, LPCWSTR lpszHeaders, DWORD dwHeadersLength, DWORD dwFlags)
+HINTERNET CNetwork::CNInternetOpenUrl(HINTERNET hInternet, LPCWSTR lpszUrl, LPCWSTR lpszHeaders, DWORD dwHeadersLength, DWORD dwFlags)
 {
 	__try	// Fix against stupid firewalls like (iS3 Anti-Spyware or Norman Virus Control)
 	{

diff --git a/shareaza/Network.h b/shareaza/Network.h
@@ -173,7 +173,7 @@ class CNetwork : public CComObject, public CThreadImpl
 	void		ClearResolve();
 
 	// Restore WinINet connection to Internet
-	bool		InternetConnect();
+	bool		CNInternetConnect();
 
 	bool		PreRun();
 	void		OnRun();
@@ -247,9 +247,9 @@ class CNetwork : public CComObject, public CThreadImpl
 	// Safe way to receive UDP data
 	static int RecvFrom(SOCKET s, char* buf, int len, SOCKADDR_IN* pFrom);
 	// Safe way to call InternetOpen
-	static HINTERNET InternetOpen();
+	static HINTERNET CNInternetOpen();
 	// Safe way to call InternetOpenUrl
-	static HINTERNET InternetOpenUrl(HINTERNET hInternet, LPCWSTR lpszUrl, LPCWSTR lpszHeaders, DWORD dwHeadersLength, DWORD dwFlags);
+	static HINTERNET CNInternetOpenUrl(HINTERNET hInternet, LPCWSTR lpszUrl, LPCWSTR lpszHeaders, DWORD dwHeadersLength, DWORD dwFlags);
 	// Safe way to call WSACleanup
 	static void Cleanup();