From 0fa2281bcd43826f4a0ef4e52cd3c88b2cee2755 Mon Sep 17 00:00:00 2001 From: "mkaply%us.ibm.com" Date: Wed, 23 Aug 2000 20:39:17 +0000 Subject: [PATCH] OS/2 Tinderbox break PR_CALLBACK git-svn-id: svn://10.0.0.236/trunk@76973 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/modules/libjar/nsJAR.cpp | 4 ++-- mozilla/xpfe/browser/src/nsBrowserInstance.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mozilla/modules/libjar/nsJAR.cpp b/mozilla/modules/libjar/nsJAR.cpp index d0ce268bb57..6514d1a45dd 100644 --- a/mozilla/modules/libjar/nsJAR.cpp +++ b/mozilla/modules/libjar/nsJAR.cpp @@ -1113,7 +1113,7 @@ nsZipReaderCache::Init(PRUint32 cacheSize) return mLock ? NS_OK : NS_ERROR_OUT_OF_MEMORY; } -static PRBool +static PRBool PR_CALLBACK DropZipReaderCache(nsHashKey *aKey, void *aData, void* closure) { nsJAR* zip = (nsJAR*)aData; @@ -1187,7 +1187,7 @@ nsZipReaderCache::GetZip(nsIFile* zipFile, nsIZipReader* *result) return rv; } -static PRBool +static PRBool PR_CALLBACK FindOldestZip(nsHashKey *aKey, void *aData, void* closure) { nsJAR** oldestPtr = (nsJAR**)closure; diff --git a/mozilla/xpfe/browser/src/nsBrowserInstance.cpp b/mozilla/xpfe/browser/src/nsBrowserInstance.cpp index 7675cd3ce5b..e95668af81b 100644 --- a/mozilla/xpfe/browser/src/nsBrowserInstance.cpp +++ b/mozilla/xpfe/browser/src/nsBrowserInstance.cpp @@ -375,7 +375,7 @@ void TimesUp(nsITimer *aTimer, void *aClosure) #endif //ENABLE_PAGE_CYCLER PRUint32 nsBrowserInstance::gRefCnt = 0; -int ButtonShowHideCallback(const char* aPref, void* aClosure); +int PR_CALLBACK ButtonShowHideCallback(const char* aPref, void* aClosure); static const char kShowToolbarElts[] = "browser.toolbars.showbutton"; //***************************************************************************** @@ -2413,7 +2413,7 @@ NS_IMPL_NSGETMODULE("nsBrowserModule", components) // Toolbar button pref callback // ================================================================================= -int ButtonShowHideCallback(const char* aPref, void* aClosure) +int PR_CALLBACK ButtonShowHideCallback(const char* aPref, void* aClosure) { nsresult rv; NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_PROGID, &rv);