r= waterson
OS/2 bring up continues - add PR_CALLBACK for VisualAge
This commit is contained in:
mkaply%us.ibm.com 2000-05-12 22:23:36 +00:00
Родитель 32ccf5669e
Коммит 8b307332cd
6 изменённых файлов: 20 добавлений и 20 удалений

Просмотреть файл

@ -100,9 +100,9 @@ protected:
static nsresult static nsresult
PostLoadEvent(nsCachedChromeChannel* aChannel, PLHandleEventProc aHandler); PostLoadEvent(nsCachedChromeChannel* aChannel, PLHandleEventProc aHandler);
static void* HandleStartLoadEvent(PLEvent* aEvent); static void* PR_CALLBACK HandleStartLoadEvent(PLEvent* aEvent);
static void* HandleStopLoadEvent(PLEvent* aEvent); static void* PR_CALLBACK HandleStopLoadEvent(PLEvent* aEvent);
static void DestroyLoadEvent(PLEvent* aEvent); static void PR_CALLBACK DestroyLoadEvent(PLEvent* aEvent);
#ifdef PR_LOGGING #ifdef PR_LOGGING
static PRLogModuleInfo* gLog; static PRLogModuleInfo* gLog;
@ -496,7 +496,7 @@ nsCachedChromeChannel::PostLoadEvent(nsCachedChromeChannel* aChannel,
return rv; return rv;
} }
void* void* PR_CALLBACK
nsCachedChromeChannel::HandleStartLoadEvent(PLEvent* aEvent) nsCachedChromeChannel::HandleStartLoadEvent(PLEvent* aEvent)
{ {
// Fire the OnStartRequest() for the cached chrome channel, then // Fire the OnStartRequest() for the cached chrome channel, then
@ -519,7 +519,7 @@ nsCachedChromeChannel::HandleStartLoadEvent(PLEvent* aEvent)
} }
void* void* PR_CALLBACK
nsCachedChromeChannel::HandleStopLoadEvent(PLEvent* aEvent) nsCachedChromeChannel::HandleStopLoadEvent(PLEvent* aEvent)
{ {
// Fire the OnStopRequest() for the cached chrome channel, and // Fire the OnStopRequest() for the cached chrome channel, and
@ -548,7 +548,7 @@ nsCachedChromeChannel::HandleStopLoadEvent(PLEvent* aEvent)
return nsnull; return nsnull;
} }
void void PR_CALLBACK
nsCachedChromeChannel::DestroyLoadEvent(PLEvent* aEvent) nsCachedChromeChannel::DestroyLoadEvent(PLEvent* aEvent)
{ {
LoadEvent* event = NS_REINTERPRET_CAST(LoadEvent*, aEvent); LoadEvent* event = NS_REINTERPRET_CAST(LoadEvent*, aEvent);

Просмотреть файл

@ -1695,7 +1695,7 @@ XULSortServiceImpl::InplaceSort(contentSortInfo *info1, contentSortInfo *info2,
int int PR_CALLBACK
inplaceSortCallback(const void *data1, const void *data2, void *privateData) inplaceSortCallback(const void *data1, const void *data2, void *privateData)
{ {
/// Note: inplaceSortCallback is a small C callback stub for NS_QuickSort /// Note: inplaceSortCallback is a small C callback stub for NS_QuickSort
@ -1715,7 +1715,7 @@ inplaceSortCallback(const void *data1, const void *data2, void *privateData)
int int PR_CALLBACK
testSortCallback(const void *data1, const void *data2, void *privateData) testSortCallback(const void *data1, const void *data2, void *privateData)
{ {
/// Note: inplaceSortCallback is a small C callback stub for NS_QuickSort /// Note: inplaceSortCallback is a small C callback stub for NS_QuickSort

Просмотреть файл

@ -709,11 +709,11 @@ protected:
const Match* mLastMatch; const Match* mLastMatch;
static PLHashNumber HashMatch(const void* aMatch) { static PLHashNumber PR_CALLBACK HashMatch(const void* aMatch) {
const Match* match = NS_STATIC_CAST(const Match*, aMatch); const Match* match = NS_STATIC_CAST(const Match*, aMatch);
return Instantiation::Hash(&match->mInstantiation) ^ (PLHashNumber(match->mRule) >> 2); } return Instantiation::Hash(&match->mInstantiation) ^ (PLHashNumber(match->mRule) >> 2); }
static PRIntn CompareMatches(const void* aLeft, const void* aRight) { static PRIntn PR_CALLBACK CompareMatches(const void* aLeft, const void* aRight) {
const Match* left = NS_STATIC_CAST(const Match*, aLeft); const Match* left = NS_STATIC_CAST(const Match*, aLeft);
const Match* right = NS_STATIC_CAST(const Match*, aRight); const Match* right = NS_STATIC_CAST(const Match*, aRight);
return *left == *right; } return *left == *right; }

Просмотреть файл

@ -100,9 +100,9 @@ protected:
static nsresult static nsresult
PostLoadEvent(nsCachedChromeChannel* aChannel, PLHandleEventProc aHandler); PostLoadEvent(nsCachedChromeChannel* aChannel, PLHandleEventProc aHandler);
static void* HandleStartLoadEvent(PLEvent* aEvent); static void* PR_CALLBACK HandleStartLoadEvent(PLEvent* aEvent);
static void* HandleStopLoadEvent(PLEvent* aEvent); static void* PR_CALLBACK HandleStopLoadEvent(PLEvent* aEvent);
static void DestroyLoadEvent(PLEvent* aEvent); static void PR_CALLBACK DestroyLoadEvent(PLEvent* aEvent);
#ifdef PR_LOGGING #ifdef PR_LOGGING
static PRLogModuleInfo* gLog; static PRLogModuleInfo* gLog;
@ -496,7 +496,7 @@ nsCachedChromeChannel::PostLoadEvent(nsCachedChromeChannel* aChannel,
return rv; return rv;
} }
void* void* PR_CALLBACK
nsCachedChromeChannel::HandleStartLoadEvent(PLEvent* aEvent) nsCachedChromeChannel::HandleStartLoadEvent(PLEvent* aEvent)
{ {
// Fire the OnStartRequest() for the cached chrome channel, then // Fire the OnStartRequest() for the cached chrome channel, then
@ -519,7 +519,7 @@ nsCachedChromeChannel::HandleStartLoadEvent(PLEvent* aEvent)
} }
void* void* PR_CALLBACK
nsCachedChromeChannel::HandleStopLoadEvent(PLEvent* aEvent) nsCachedChromeChannel::HandleStopLoadEvent(PLEvent* aEvent)
{ {
// Fire the OnStopRequest() for the cached chrome channel, and // Fire the OnStopRequest() for the cached chrome channel, and
@ -548,7 +548,7 @@ nsCachedChromeChannel::HandleStopLoadEvent(PLEvent* aEvent)
return nsnull; return nsnull;
} }
void void PR_CALLBACK
nsCachedChromeChannel::DestroyLoadEvent(PLEvent* aEvent) nsCachedChromeChannel::DestroyLoadEvent(PLEvent* aEvent)
{ {
LoadEvent* event = NS_REINTERPRET_CAST(LoadEvent*, aEvent); LoadEvent* event = NS_REINTERPRET_CAST(LoadEvent*, aEvent);

Просмотреть файл

@ -1695,7 +1695,7 @@ XULSortServiceImpl::InplaceSort(contentSortInfo *info1, contentSortInfo *info2,
int int PR_CALLBACK
inplaceSortCallback(const void *data1, const void *data2, void *privateData) inplaceSortCallback(const void *data1, const void *data2, void *privateData)
{ {
/// Note: inplaceSortCallback is a small C callback stub for NS_QuickSort /// Note: inplaceSortCallback is a small C callback stub for NS_QuickSort
@ -1715,7 +1715,7 @@ inplaceSortCallback(const void *data1, const void *data2, void *privateData)
int int PR_CALLBACK
testSortCallback(const void *data1, const void *data2, void *privateData) testSortCallback(const void *data1, const void *data2, void *privateData)
{ {
/// Note: inplaceSortCallback is a small C callback stub for NS_QuickSort /// Note: inplaceSortCallback is a small C callback stub for NS_QuickSort

Просмотреть файл

@ -709,11 +709,11 @@ protected:
const Match* mLastMatch; const Match* mLastMatch;
static PLHashNumber HashMatch(const void* aMatch) { static PLHashNumber PR_CALLBACK HashMatch(const void* aMatch) {
const Match* match = NS_STATIC_CAST(const Match*, aMatch); const Match* match = NS_STATIC_CAST(const Match*, aMatch);
return Instantiation::Hash(&match->mInstantiation) ^ (PLHashNumber(match->mRule) >> 2); } return Instantiation::Hash(&match->mInstantiation) ^ (PLHashNumber(match->mRule) >> 2); }
static PRIntn CompareMatches(const void* aLeft, const void* aRight) { static PRIntn PR_CALLBACK CompareMatches(const void* aLeft, const void* aRight) {
const Match* left = NS_STATIC_CAST(const Match*, aLeft); const Match* left = NS_STATIC_CAST(const Match*, aLeft);
const Match* right = NS_STATIC_CAST(const Match*, aRight); const Match* right = NS_STATIC_CAST(const Match*, aRight);
return *left == *right; } return *left == *right; }