Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 22:32:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

# 34082

Browse Source 
r= waterson@netscape.com
OS/2 Visual Age build - Adding PR_CALLBACK to some functoins for linkage
This commit is contained in:
mkaply%us.ibm.com 2000-04-05 02:39:51 +00:00
parent 82d7f9a603
commit cedcce6c59
10 changed files with 150 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
content/xul/content/src/nsXULElement.cpp
View File

@ -19,6 +19,19 @@
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*
*
* This Original Code has been modified by IBM Corporation.
* Modifications made by IBM described herein are
* Copyright (c) International Business Machines
* Corporation, 2000
*
* Modifications to Mozilla code or documentation
* identified per MPL Section 3.3
*
* Date Modified by Description of modification
* 03/27/2000 IBM Corp. Added PR_CALLBACK for Optlink
* use in OS2
*/
/*
@ -1882,7 +1895,6 @@ nsXULElement::HandleEvent(nsIDOMEvent *aEvent)
}
//----------------------------------------------------------------------
// nsIScriptObjectOwner interface
@ -1894,7 +1906,7 @@ nsXULElement::GetScriptObject(nsIScriptContext* aContext, void** aScriptObject)
if (! mScriptObject) {
// The actual script object that we create will depend on our
// tag...
nsresult (*fn)(nsIScriptContext* aContext, nsISupports* aSupports, nsISupports* aParent, void** aReturn);
nsresult (*PR_CALLBACK fn)(nsIScriptContext* aContext, nsISupports* aSupports, nsISupports* aParent, void** aReturn);
nsCOMPtr<nsIAtom> tag;
GetBaseTag(getter_AddRefs(tag));

21
content/xul/document/src/nsElementMap.h
View File

@ -18,6 +18,19 @@
* Rights Reserved.
*
* Contributor(s):
*
*
* This Original Code has been modified by IBM Corporation.
* Modifications made by IBM described herein are
* Copyright (c) International Business Machines
* Corporation, 2000
*
* Modifications to Mozilla code or documentation
* identified per MPL Section 3.3
*
* Date Modified by Description of modification
* 03/27/2000 IBM Corp. Added PR_CALLBACK for Optlink
* use in OS2
*/
/*
@ -57,13 +70,13 @@ private:
nsCOMPtr<nsIContent> mContent;
};
static PLHashNumber
static PLHashNumber PR_CALLBACK
Hash(const void* akey);
static PRIntn
static PRIntn PR_CALLBACK
Compare(const void* aLeft, const void* aRight);
static PRIntn
static PRIntn PR_CALLBACK
ReleaseContentList(PLHashEntry* aHashEntry, PRIntn aIndex, void* aClosure);
public:
@ -94,7 +107,7 @@ private:
void* mClosure;
};
static PRIntn
static PRIntn PR_CALLBACK
EnumerateImpl(PLHashEntry* aHashEntry, PRIntn aIndex, void* aClosure);
};

15
content/xul/templates/src/nsXULContentUtils.cpp
View File

@ -18,6 +18,19 @@
* Rights Reserved.
*
* Contributor(s):
*
*
* This Original Code has been modified by IBM Corporation.
* Modifications made by IBM described herein are
* Copyright (c) International Business Machines
* Corporation, 2000
*
* Modifications to Mozilla code or documentation
* identified per MPL Section 3.3
*
* Date Modified by Description of modification
* 03/27/2000 IBM Corp. Added PR_CALLBACK for Optlink
* use in OS2
*/
@ -106,7 +119,7 @@ protected:
static PRBool gDisableXULCache;
static int
static int PR_CALLBACK
DisableXULCacheChangedCallback(const char* aPrefName, void* aClosure);
public:

15
content/xul/templates/src/nsXULSortService.cpp
View File

@ -20,6 +20,19 @@
* Contributor(s):
* Robert John Churchill <rjc@netscape.com>
* Pierre Phaneuf <pp@ludusdesign.com>
*
*
* This Original Code has been modified by IBM Corporation.
* Modifications made by IBM described herein are
* Copyright (c) International Business Machines
* Corporation, 2000
*
* Modifications to Mozilla code or documentation
* identified per MPL Section 3.3
*
* Date Modified by Description of modification
* 03/27/2000 IBM Corp. Added PR_CALLBACK for Optlink
* use in OS2
*/
/*
@ -172,7 +185,7 @@ typedef struct {
PRBool checkedNode2;
} contentSortInfo;
int inplaceSortCallback(const void *data1, const void *data2, void *privateData);
int PR_CALLBACK inplaceSortCallback(const void *data1, const void *data2, void *privateData);
int testSortCallback(const void * data1, const void *data2, void *privateData);

21
rdf/base/src/nsInMemoryDataSource.cpp
View File

@ -19,6 +19,19 @@
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*
*
* This Original Code has been modified by IBM Corporation.
* Modifications made by IBM described herein are
* Copyright (c) International Business Machines
* Corporation, 2000
*
* Modifications to Mozilla code or documentation
* identified per MPL Section 3.3
*
* Date Modified by Description of modification
* 03/27/2000 IBM Corp. Added PR_CALLBACK for Optlink
* use in OS2
*/
/*
@ -158,7 +171,7 @@ Assertion::~Assertion()
////////////////////////////////////////////////////////////////////////
// Utility routines
static inline PLHashNumber
static inline PLHashNumber PR_CALLBACK
rdf_HashPointer(const void* key)
{
return NS_REINTERPRET_CAST(PLHashNumber, key) >> 2;
@ -184,7 +197,7 @@ protected:
static const PRInt32 kInitialTableSize;
static PRIntn DeleteForwardArcsEntry(PLHashEntry* he, PRIntn i, void* arg);
static PRIntn PR_CALLBACK DeleteForwardArcsEntry(PLHashEntry* he, PRIntn i, void* arg);
friend class InMemoryResourceEnumeratorImpl; // b/c it needs to enumerate mForwardArcs
@ -218,7 +231,7 @@ public:
NS_DECL_NSIRDFPURGEABLEDATASOURCE
protected:
static PRIntn SweepForwardArcsEntries(PLHashEntry* he, PRIntn i, void* arg);
static PRIntn PR_CALLBACK SweepForwardArcsEntries(PLHashEntry* he, PRIntn i, void* arg);
public:
// Implementation methods
@ -1372,7 +1385,7 @@ InMemoryDataSource::ArcLabelsOut(nsIRDFResource* aSource, nsISimpleEnumerator**
return NS_OK;
}
static PRIntn
static PRIntn PR_CALLBACK
rdf_ResourceEnumerator(PLHashEntry* he, PRIntn i, void* closure)
{
nsISupportsArray* resources = NS_STATIC_CAST(nsISupportsArray*, closure);

17
rdf/base/src/nsRDFService.cpp
View File

@ -19,6 +19,19 @@
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*
*
* This Original Code has been modified by IBM Corporation.
* Modifications made by IBM described herein are
* Copyright (c) International Business Machines
* Corporation, 2000
*
* Modifications to Mozilla code or documentation
* identified per MPL Section 3.3
*
* Date Modified by Description of modification
* 03/27/2000 IBM Corp. Added PR_CALLBACK for Optlink
* use in OS2
*/
/*
@ -429,7 +442,7 @@ IntImpl::EqualsInt(nsIRDFInt* intValue, PRBool* result)
////////////////////////////////////////////////////////////////////////
// RDFServiceImpl
static PLHashNumber
static PLHashNumber PR_CALLBACK
rdf_HashWideString(const void* key)
{
PLHashNumber result = 0;
@ -438,7 +451,7 @@ rdf_HashWideString(const void* key)
return result;
}
static PRIntn
static PRIntn PR_CALLBACK
rdf_CompareWideStrings(const void* v1, const void* v2)
{
return 0 == nsCRT::strcmp(NS_STATIC_CAST(const PRUnichar*, v1), NS_STATIC_CAST(const PRUnichar*, v2));

21
rdf/content/src/nsElementMap.h
View File

@ -18,6 +18,19 @@
* Rights Reserved.
*
* Contributor(s):
*
*
* This Original Code has been modified by IBM Corporation.
* Modifications made by IBM described herein are
* Copyright (c) International Business Machines
* Corporation, 2000
*
* Modifications to Mozilla code or documentation
* identified per MPL Section 3.3
*
* Date Modified by Description of modification
* 03/27/2000 IBM Corp. Added PR_CALLBACK for Optlink
* use in OS2
*/
/*
@ -57,13 +70,13 @@ private:
nsCOMPtr<nsIContent> mContent;
};
static PLHashNumber
static PLHashNumber PR_CALLBACK
Hash(const void* akey);
static PRIntn
static PRIntn PR_CALLBACK
Compare(const void* aLeft, const void* aRight);
static PRIntn
static PRIntn PR_CALLBACK
ReleaseContentList(PLHashEntry* aHashEntry, PRIntn aIndex, void* aClosure);
public:
@ -94,7 +107,7 @@ private:
void* mClosure;
};
static PRIntn
static PRIntn PR_CALLBACK
EnumerateImpl(PLHashEntry* aHashEntry, PRIntn aIndex, void* aClosure);
};

15
rdf/content/src/nsXULContentUtils.cpp
View File

@ -18,6 +18,19 @@
* Rights Reserved.
*
* Contributor(s):
*
*
* This Original Code has been modified by IBM Corporation.
* Modifications made by IBM described herein are
* Copyright (c) International Business Machines
* Corporation, 2000
*
* Modifications to Mozilla code or documentation
* identified per MPL Section 3.3
*
* Date Modified by Description of modification
* 03/27/2000 IBM Corp. Added PR_CALLBACK for Optlink
* use in OS2
*/
@ -106,7 +119,7 @@ protected:
static PRBool gDisableXULCache;
static int
static int PR_CALLBACK
DisableXULCacheChangedCallback(const char* aPrefName, void* aClosure);
public:

16
rdf/content/src/nsXULElement.cpp
View File

@ -19,6 +19,19 @@
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*
*
* This Original Code has been modified by IBM Corporation.
* Modifications made by IBM described herein are
* Copyright (c) International Business Machines
* Corporation, 2000
*
* Modifications to Mozilla code or documentation
* identified per MPL Section 3.3
*
* Date Modified by Description of modification
* 03/27/2000 IBM Corp. Added PR_CALLBACK for Optlink
* use in OS2
*/
/*
@ -1882,7 +1895,6 @@ nsXULElement::HandleEvent(nsIDOMEvent *aEvent)
}
//----------------------------------------------------------------------
// nsIScriptObjectOwner interface
@ -1894,7 +1906,7 @@ nsXULElement::GetScriptObject(nsIScriptContext* aContext, void** aScriptObject)
if (! mScriptObject) {
// The actual script object that we create will depend on our
// tag...
nsresult (*fn)(nsIScriptContext* aContext, nsISupports* aSupports, nsISupports* aParent, void** aReturn);
nsresult (*PR_CALLBACK fn)(nsIScriptContext* aContext, nsISupports* aSupports, nsISupports* aParent, void** aReturn);
nsCOMPtr<nsIAtom> tag;
GetBaseTag(getter_AddRefs(tag));

15
rdf/content/src/nsXULSortService.cpp
View File

@ -20,6 +20,19 @@
* Contributor(s):
* Robert John Churchill <rjc@netscape.com>
* Pierre Phaneuf <pp@ludusdesign.com>
*
*
* This Original Code has been modified by IBM Corporation.
* Modifications made by IBM described herein are
* Copyright (c) International Business Machines
* Corporation, 2000
*
* Modifications to Mozilla code or documentation
* identified per MPL Section 3.3
*
* Date Modified by Description of modification
* 03/27/2000 IBM Corp. Added PR_CALLBACK for Optlink
* use in OS2
*/
/*
@ -172,7 +185,7 @@ typedef struct {
PRBool checkedNode2;
} contentSortInfo;
int inplaceSortCallback(const void *data1, const void *data2, void *privateData);
int PR_CALLBACK inplaceSortCallback(const void *data1, const void *data2, void *privateData);
int testSortCallback(const void * data1, const void *data2, void *privateData);