# 37239
r= waterson OS/2 bring up continues - add PR_CALLBACK for VisualAge
This commit is contained in:
mkaply%us.ibm.com
Родитель
32ccf5669e
Коммит
8b307332cd
|
|
@ -100,9 +100,9 @@ protected:
|
|||
static nsresult
|
||||
PostLoadEvent(nsCachedChromeChannel* aChannel, PLHandleEventProc aHandler);
|
||||
|
||||
static void* HandleStartLoadEvent(PLEvent* aEvent);
|
||||
static void* HandleStopLoadEvent(PLEvent* aEvent);
|
||||
static void DestroyLoadEvent(PLEvent* aEvent);
|
||||
static void* PR_CALLBACK HandleStartLoadEvent(PLEvent* aEvent);
|
||||
static void* PR_CALLBACK HandleStopLoadEvent(PLEvent* aEvent);
|
||||
static void PR_CALLBACK DestroyLoadEvent(PLEvent* aEvent);
|
||||
|
||||
#ifdef PR_LOGGING
|
||||
static PRLogModuleInfo* gLog;
|
||||
|
|
@ -496,7 +496,7 @@ nsCachedChromeChannel::PostLoadEvent(nsCachedChromeChannel* aChannel,
|
|||
return rv;
|
||||
}
|
||||
|
||||
void*
|
||||
void* PR_CALLBACK
|
||||
nsCachedChromeChannel::HandleStartLoadEvent(PLEvent* aEvent)
|
||||
{
|
||||
// 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)
|
||||
{
|
||||
// Fire the OnStopRequest() for the cached chrome channel, and
|
||||
|
|
@ -548,7 +548,7 @@ nsCachedChromeChannel::HandleStopLoadEvent(PLEvent* aEvent)
|
|||
return nsnull;
|
||||
}
|
||||
|
||||
void
|
||||
void PR_CALLBACK
|
||||
nsCachedChromeChannel::DestroyLoadEvent(PLEvent* 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)
|
||||
{
|
||||
/// 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)
|
||||
{
|
||||
/// Note: inplaceSortCallback is a small C callback stub for NS_QuickSort
|
||||
|
|
|
|||
|
|
@ -709,11 +709,11 @@ protected:
|
|||
|
||||
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);
|
||||
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* right = NS_STATIC_CAST(const Match*, aRight);
|
||||
return *left == *right; }
|
||||
|
|
|
|||
|
|
@ -100,9 +100,9 @@ protected:
|
|||
static nsresult
|
||||
PostLoadEvent(nsCachedChromeChannel* aChannel, PLHandleEventProc aHandler);
|
||||
|
||||
static void* HandleStartLoadEvent(PLEvent* aEvent);
|
||||
static void* HandleStopLoadEvent(PLEvent* aEvent);
|
||||
static void DestroyLoadEvent(PLEvent* aEvent);
|
||||
static void* PR_CALLBACK HandleStartLoadEvent(PLEvent* aEvent);
|
||||
static void* PR_CALLBACK HandleStopLoadEvent(PLEvent* aEvent);
|
||||
static void PR_CALLBACK DestroyLoadEvent(PLEvent* aEvent);
|
||||
|
||||
#ifdef PR_LOGGING
|
||||
static PRLogModuleInfo* gLog;
|
||||
|
|
@ -496,7 +496,7 @@ nsCachedChromeChannel::PostLoadEvent(nsCachedChromeChannel* aChannel,
|
|||
return rv;
|
||||
}
|
||||
|
||||
void*
|
||||
void* PR_CALLBACK
|
||||
nsCachedChromeChannel::HandleStartLoadEvent(PLEvent* aEvent)
|
||||
{
|
||||
// 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)
|
||||
{
|
||||
// Fire the OnStopRequest() for the cached chrome channel, and
|
||||
|
|
@ -548,7 +548,7 @@ nsCachedChromeChannel::HandleStopLoadEvent(PLEvent* aEvent)
|
|||
return nsnull;
|
||||
}
|
||||
|
||||
void
|
||||
void PR_CALLBACK
|
||||
nsCachedChromeChannel::DestroyLoadEvent(PLEvent* 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)
|
||||
{
|
||||
/// 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)
|
||||
{
|
||||
/// Note: inplaceSortCallback is a small C callback stub for NS_QuickSort
|
||||
|
|
|
|||
|
|
@ -709,11 +709,11 @@ protected:
|
|||
|
||||
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);
|
||||
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* right = NS_STATIC_CAST(const Match*, aRight);
|
||||
return *left == *right; }
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче