diff --git a/mozilla/docshell/base/nsWebShell.cpp b/mozilla/docshell/base/nsWebShell.cpp index 1a47943b988..82960e39e8b 100644 --- a/mozilla/docshell/base/nsWebShell.cpp +++ b/mozilla/docshell/base/nsWebShell.cpp @@ -2698,12 +2698,12 @@ nsWebShell::ReloadDocument(const char* aCharset, s = (nsString*) mHistory.ElementAt(mHistoryIndex); #else if (mSHist) { - PRInt32 index = 0; + PRInt32 indix = 0; nsresult rv; - rv = mSHist->getCurrentIndex(index); + rv = mSHist->getCurrentIndex(indix); if (NS_SUCCEEDED(rv)) { - PRUnichar * url=nsnull; - rv = mSHist->GetURLForIndex(index, &url); + const PRUnichar * url=nsnull; + rv = mSHist->GetURLForIndex(indix, &url); if (NS_SUCCEEDED(rv)) s = new nsString(url); } diff --git a/mozilla/webshell/src/nsWebShell.cpp b/mozilla/webshell/src/nsWebShell.cpp index 1a47943b988..82960e39e8b 100644 --- a/mozilla/webshell/src/nsWebShell.cpp +++ b/mozilla/webshell/src/nsWebShell.cpp @@ -2698,12 +2698,12 @@ nsWebShell::ReloadDocument(const char* aCharset, s = (nsString*) mHistory.ElementAt(mHistoryIndex); #else if (mSHist) { - PRInt32 index = 0; + PRInt32 indix = 0; nsresult rv; - rv = mSHist->getCurrentIndex(index); + rv = mSHist->getCurrentIndex(indix); if (NS_SUCCEEDED(rv)) { - PRUnichar * url=nsnull; - rv = mSHist->GetURLForIndex(index, &url); + const PRUnichar * url=nsnull; + rv = mSHist->GetURLForIndex(indix, &url); if (NS_SUCCEEDED(rv)) s = new nsString(url); }