diff --git a/accessible/src/base/nsAccessNode.h b/accessible/src/base/nsAccessNode.h index a12fb5cf1970..1012c3025649 100755 --- a/accessible/src/base/nsAccessNode.h +++ b/accessible/src/base/nsAccessNode.h @@ -102,7 +102,7 @@ class nsAccessNode: public nsIAccessNode, void* aUniqueID, nsIAccessNode **aAccessNode); static void ClearCache(nsAccessNodeHashtable& aCache); - static PLDHashOperator PR_CALLBACK ClearCacheEntry(const void* aKey, nsCOMPtr& aAccessNode, void* aUserArg); + static PLDHashOperator ClearCacheEntry(const void* aKey, nsCOMPtr& aAccessNode, void* aUserArg); // Static cache methods for global document cache static already_AddRefed GetDocAccessibleFor(nsIDocument *aDocument); diff --git a/accessible/src/base/nsDocAccessible.cpp b/accessible/src/base/nsDocAccessible.cpp index 94f22c4b3a3d..e253f076efb8 100644 --- a/accessible/src/base/nsDocAccessible.cpp +++ b/accessible/src/base/nsDocAccessible.cpp @@ -138,7 +138,7 @@ nsDocAccessible::~nsDocAccessible() //////////////////////////////////////////////////////////////////////////////// // nsDocAccessible. nsISupports -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator ElementTraverser(const void *aKey, nsIAccessNode *aAccessNode, void *aUserArg) { diff --git a/caps/include/nsScriptSecurityManager.h b/caps/include/nsScriptSecurityManager.h index 6430a7775e57..d52001d92731 100644 --- a/caps/include/nsScriptSecurityManager.h +++ b/caps/include/nsScriptSecurityManager.h @@ -180,7 +180,7 @@ struct PropertyPolicy : public PLDHashEntryHdr SecurityLevel mSet; }; -PR_STATIC_CALLBACK(PRBool) +static PRBool InitPropertyPolicyEntry(PLDHashTable *table, PLDHashEntryHdr *entry, const void *key) @@ -192,7 +192,7 @@ InitPropertyPolicyEntry(PLDHashTable *table, return PR_TRUE; } -PR_STATIC_CALLBACK(void) +static void ClearPropertyPolicyEntry(PLDHashTable *table, PLDHashEntryHdr *entry) { PropertyPolicy* pp = (PropertyPolicy*)entry; @@ -212,7 +212,7 @@ struct ClassPolicy : public PLDHashEntryHdr DomainPolicy* mDomainWeAreWildcardFor; }; -PR_STATIC_CALLBACK(void) +static void ClearClassPolicyEntry(PLDHashTable *table, PLDHashEntryHdr *entry) { ClassPolicy* cp = (ClassPolicy *)entry; @@ -226,12 +226,12 @@ ClearClassPolicyEntry(PLDHashTable *table, PLDHashEntryHdr *entry) // Note: actual impl is going to be after the DomainPolicy class definition, // since we need to access members of DomainPolicy in the impl -PR_STATIC_CALLBACK(void) +static void MoveClassPolicyEntry(PLDHashTable *table, const PLDHashEntryHdr *from, PLDHashEntryHdr *to); -PR_STATIC_CALLBACK(PRBool) +static PRBool InitClassPolicyEntry(PLDHashTable *table, PLDHashEntryHdr *entry, const void *key) @@ -344,7 +344,7 @@ private: }; -PR_STATIC_CALLBACK(void) +static void MoveClassPolicyEntry(PLDHashTable *table, const PLDHashEntryHdr *from, PLDHashEntryHdr *to) diff --git a/caps/src/nsPrincipal.cpp b/caps/src/nsPrincipal.cpp index ca98ec67eecc..2c89c565c3ea 100755 --- a/caps/src/nsPrincipal.cpp +++ b/caps/src/nsPrincipal.cpp @@ -844,7 +844,7 @@ struct CapabilityList nsCString* denied; }; -PR_STATIC_CALLBACK(PRBool) +static PRBool AppendCapability(nsHashKey *aKey, void *aData, void *capListPtr) { CapabilityList* capList = (CapabilityList*)capListPtr; @@ -971,7 +971,7 @@ nsPrincipal::GetPreferences(char** aPrefName, char** aID, return NS_OK; } -PR_STATIC_CALLBACK(nsresult) +static nsresult ReadAnnotationEntry(nsIObjectInputStream* aStream, nsHashKey** aKey, void** aData) { @@ -993,7 +993,7 @@ ReadAnnotationEntry(nsIObjectInputStream* aStream, nsHashKey** aKey, return NS_OK; } -PR_STATIC_CALLBACK(void) +static void FreeAnnotationEntry(nsIObjectInputStream* aStream, nsHashKey* aKey, void* aData) { @@ -1085,7 +1085,7 @@ nsPrincipal::Read(nsIObjectInputStream* aStream) return NS_OK; } -PR_STATIC_CALLBACK(nsresult) +static nsresult WriteScalarValue(nsIObjectOutputStream* aStream, void* aData) { PRUint32 value = NS_PTR_TO_INT32(aData); diff --git a/caps/src/nsScriptSecurityManager.cpp b/caps/src/nsScriptSecurityManager.cpp index 4288b2a10a98..7b81f97b30da 100644 --- a/caps/src/nsScriptSecurityManager.cpp +++ b/caps/src/nsScriptSecurityManager.cpp @@ -399,7 +399,7 @@ nsScriptSecurityManager::GetCxSubjectPrincipal(JSContext *cx) //////////////////// // Table of security levels -PR_STATIC_CALLBACK(PRBool) +static PRBool DeleteCapability(nsHashKey *aKey, void *aData, void* closure) { NS_Free(aData); @@ -449,7 +449,7 @@ struct DomainEntry #endif }; -PR_STATIC_CALLBACK(PRBool) +static PRBool DeleteDomainEntry(nsHashKey *aKey, void *aData, void* closure) { DomainEntry *entry = (DomainEntry*) aData; @@ -3897,9 +3897,9 @@ nsScriptSecurityManager::InitPrefs() #ifdef DEBUG_CAPS_HACKER //typedef PLDHashOperator -//(* PR_CALLBACK PLDHashEnumerator)(PLDHashTable *table, PLDHashEntryHdr *hdr, -// PRUint32 number, void *arg); -PR_STATIC_CALLBACK(PLDHashOperator) +//(* PLDHashEnumerator)(PLDHashTable *table, PLDHashEntryHdr *hdr, +// PRUint32 number, void *arg); +static PLDHashOperator PrintPropertyPolicy(PLDHashTable *table, PLDHashEntryHdr *entry, PRUint32 number, void *arg) { @@ -3925,7 +3925,7 @@ PrintPropertyPolicy(PLDHashTable *table, PLDHashEntryHdr *entry, return PL_DHASH_NEXT; } -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator PrintClassPolicy(PLDHashTable *table, PLDHashEntryHdr *entry, PRUint32 number, void *arg) { @@ -3937,8 +3937,8 @@ PrintClassPolicy(PLDHashTable *table, PLDHashEntryHdr *entry, } // typedef PRBool -// (*PR_CALLBACK nsHashtableEnumFunc)(nsHashKey *aKey, void *aData, void* aClosure); -PR_STATIC_CALLBACK(PRBool) +// (* nsHashtableEnumFunc)(nsHashKey *aKey, void *aData, void* aClosure); +static PRBool PrintDomainPolicy(nsHashKey *aKey, void *aData, void* aClosure) { DomainEntry* de = (DomainEntry*)aData; @@ -3949,7 +3949,7 @@ PrintDomainPolicy(nsHashKey *aKey, void *aData, void* aClosure) return PR_TRUE; } -PR_STATIC_CALLBACK(PRBool) +static PRBool PrintCapability(nsHashKey *aKey, void *aData, void* aClosure) { char* cap = (char*)aData; diff --git a/caps/src/nsSecurityManagerFactory.cpp b/caps/src/nsSecurityManagerFactory.cpp index 6573773315e2..a4a17415cc41 100644 --- a/caps/src/nsSecurityManagerFactory.cpp +++ b/caps/src/nsSecurityManagerFactory.cpp @@ -130,7 +130,7 @@ getUTF8StringArgument(JSContext *cx, JSObject *obj, PRUint16 argNum, CopyUTF16toUTF8(data, aRetval); } -PR_STATIC_CALLBACK(JSBool) +static JSBool netscape_security_isPrivilegeEnabled(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { @@ -153,7 +153,7 @@ netscape_security_isPrivilegeEnabled(JSContext *cx, JSObject *obj, uintN argc, } -PR_STATIC_CALLBACK(JSBool) +static JSBool netscape_security_enablePrivilege(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { @@ -175,7 +175,7 @@ netscape_security_enablePrivilege(JSContext *cx, JSObject *obj, uintN argc, return JS_TRUE; } -PR_STATIC_CALLBACK(JSBool) +static JSBool netscape_security_disablePrivilege(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { @@ -197,7 +197,7 @@ netscape_security_disablePrivilege(JSContext *cx, JSObject *obj, uintN argc, return JS_TRUE; } -PR_STATIC_CALLBACK(JSBool) +static JSBool netscape_security_revertPrivilege(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { @@ -219,7 +219,7 @@ netscape_security_revertPrivilege(JSContext *cx, JSObject *obj, uintN argc, return JS_TRUE; } -PR_STATIC_CALLBACK(JSBool) +static JSBool netscape_security_setCanEnablePrivilege(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { @@ -245,7 +245,7 @@ netscape_security_setCanEnablePrivilege(JSContext *cx, JSObject *obj, uintN argc return JS_TRUE; } -PR_STATIC_CALLBACK(JSBool) +static JSBool netscape_security_invalidate(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { @@ -497,7 +497,7 @@ static const nsModuleComponentInfo capsComponentInfo[] = }; -void PR_CALLBACK +void CapsModuleDtor(nsIModule* thisModules) { nsScriptSecurityManager::Shutdown(); diff --git a/content/base/public/nsContentUtils.h b/content/base/public/nsContentUtils.h index 1e93fadc2316..8948bccbb452 100644 --- a/content/base/public/nsContentUtils.h +++ b/content/base/public/nsContentUtils.h @@ -1359,8 +1359,7 @@ private: static nsIDOMScriptObjectFactory *GetDOMScriptObjectFactory(); static nsresult HoldScriptObject(PRUint32 aLangID, void* aObject); - PR_STATIC_CALLBACK(void) DropScriptObject(PRUint32 aLangID, void *aObject, - void *aClosure); + static void DropScriptObject(PRUint32 aLangID, void *aObject, void *aClosure); static PRBool CanCallerAccess(nsIPrincipal* aSubjectPrincipal, nsIPrincipal* aPrincipal); diff --git a/content/base/src/mozSanitizingSerializer.cpp b/content/base/src/mozSanitizingSerializer.cpp index 74eece9a3976..335b0eba0e60 100644 --- a/content/base/src/mozSanitizingSerializer.cpp +++ b/content/base/src/mozSanitizingSerializer.cpp @@ -107,7 +107,7 @@ mozSanitizingHTMLSerializer::~mozSanitizingHTMLSerializer() } // -PRBool PR_CALLBACK +PRBool mozSanitizingHTMLSerializer::ReleaseProperties(nsHashKey* key, void* data, void* closure) { diff --git a/content/base/src/mozSanitizingSerializer.h b/content/base/src/mozSanitizingSerializer.h index 6b3473eb6f98..a24f9a733dd6 100644 --- a/content/base/src/mozSanitizingSerializer.h +++ b/content/base/src/mozSanitizingSerializer.h @@ -65,8 +65,7 @@ class mozSanitizingHTMLSerializer : public nsIContentSerializer, public: mozSanitizingHTMLSerializer(); virtual ~mozSanitizingHTMLSerializer(); - static PRBool PR_CALLBACK ReleaseProperties(nsHashKey* key, void* data, - void* closure); + static PRBool ReleaseProperties(nsHashKey* key, void* data, void* closure); NS_DECL_ISUPPORTS diff --git a/content/base/src/nsContentList.cpp b/content/base/src/nsContentList.cpp index 9ddd42e68c83..7c7fe7a8dc3e 100644 --- a/content/base/src/nsContentList.cpp +++ b/content/base/src/nsContentList.cpp @@ -192,14 +192,14 @@ struct ContentListHashEntry : public PLDHashEntryHdr nsContentList* mContentList; }; -PR_STATIC_CALLBACK(PLDHashNumber) +static PLDHashNumber ContentListHashtableHashKey(PLDHashTable *table, const void *key) { const nsContentListKey* list = static_cast(key); return list->GetHash(); } -PR_STATIC_CALLBACK(PRBool) +static PRBool ContentListHashtableMatchEntry(PLDHashTable *table, const PLDHashEntryHdr *entry, const void *key) diff --git a/content/base/src/nsContentUtils.cpp b/content/base/src/nsContentUtils.cpp index f14ae7c79a98..9cd80eb9079b 100644 --- a/content/base/src/nsContentUtils.cpp +++ b/content/base/src/nsContentUtils.cpp @@ -242,7 +242,7 @@ public: nsCOMPtr mListenerManager; }; -PR_STATIC_CALLBACK(PRBool) +static PRBool EventListenerManagerHashInitEntry(PLDHashTable *table, PLDHashEntryHdr *entry, const void *key) { @@ -251,7 +251,7 @@ EventListenerManagerHashInitEntry(PLDHashTable *table, PLDHashEntryHdr *entry, return PR_TRUE; } -PR_STATIC_CALLBACK(void) +static void EventListenerManagerHashClearEntry(PLDHashTable *table, PLDHashEntryHdr *entry) { EventListenerManagerMapEntry *lm = @@ -2600,7 +2600,7 @@ nsContentUtils::UnregisterPrefCallback(const char *aPref, sPref->UnregisterCallback(aPref, aCallback, aClosure); } -static int PR_CALLBACK +static int BoolVarChanged(const char *aPref, void *aClosure) { PRBool* cache = static_cast(aClosure); diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp index 585d00a5646d..670faa2631a3 100644 --- a/content/base/src/nsDocument.cpp +++ b/content/base/src/nsDocument.cpp @@ -271,7 +271,7 @@ nsUint32ToContentHashEntry::InitHashSet(HashSet** aSet) return NS_OK; } -static PLDHashOperator PR_CALLBACK +static PLDHashOperator nsUint32ToContentHashEntryVisitorCallback(nsISupportsHashKey* aEntry, void* aClosure) { @@ -395,7 +395,7 @@ struct FireChangeArgs { nsIContent* mTo; }; -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator FireChangeEnumerator(nsIdentifierMapEntry::ChangeCallbackEntry *aEntry, void *aArg) { FireChangeArgs* args = static_cast(aArg); @@ -1452,7 +1452,7 @@ nsDocument::nsDocument(const char* aContentType) SetDOMStringToNull(mLastStyleSheetSet); } -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator ClearAllBoxObjects(const void* aKey, nsPIBoxObject* aBoxObject, void* aUserArg) { if (aBoxObject) { @@ -1616,7 +1616,7 @@ NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS_WITH_DESTROY(nsDocument, nsNodeUtils::LastRelease(this)) -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator SubDocTraverser(PLDHashTable *table, PLDHashEntryHdr *hdr, PRUint32 number, void *arg) { @@ -1632,7 +1632,7 @@ SubDocTraverser(PLDHashTable *table, PLDHashEntryHdr *hdr, PRUint32 number, return PL_DHASH_NEXT; } -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator RadioGroupsTraverser(const nsAString& aKey, nsRadioGroupStruct* aData, void* aClosure) { @@ -1653,7 +1653,7 @@ RadioGroupsTraverser(const nsAString& aKey, nsRadioGroupStruct* aData, return PL_DHASH_NEXT; } -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator BoxObjectTraverser(const void* key, nsPIBoxObject* boxObject, void* userArg) { nsCycleCollectionTraversalCallback *cb = @@ -1676,7 +1676,7 @@ public: } }; -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator LinkMapTraverser(nsUint32ToContentHashEntry* aEntry, void* userArg) { LinkMapTraversalVisitor visitor; @@ -1685,7 +1685,7 @@ LinkMapTraverser(nsUint32ToContentHashEntry* aEntry, void* userArg) return PL_DHASH_NEXT; } -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator IdentifierMapEntryTraverse(nsIdentifierMapEntry *aEntry, void *aArg) { nsCycleCollectionTraversalCallback *cb = @@ -2971,7 +2971,7 @@ nsDocument::GetPrimaryShell() const return mShellsAreHidden ? nsnull : mPresShells.SafeElementAt(0, nsnull); } -PR_STATIC_CALLBACK(void) +static void SubDocClearEntry(PLDHashTable *table, PLDHashEntryHdr *entry) { SubDocMapEntry *e = static_cast(entry); @@ -2983,7 +2983,7 @@ SubDocClearEntry(PLDHashTable *table, PLDHashEntryHdr *entry) } } -PR_STATIC_CALLBACK(PRBool) +static PRBool SubDocInitEntry(PLDHashTable *table, PLDHashEntryHdr *entry, const void *key) { SubDocMapEntry *e = @@ -3082,7 +3082,7 @@ nsDocument::GetSubDocumentFor(nsIContent *aContent) const return nsnull; } -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator FindContentEnumerator(PLDHashTable *table, PLDHashEntryHdr *hdr, PRUint32 number, void *arg) { @@ -5707,7 +5707,7 @@ nsDocument::SetDocumentURI(const nsAString& aDocumentURI) static void BlastSubtreeToPieces(nsINode *aNode); -PLDHashOperator PR_CALLBACK +PLDHashOperator BlastFunc(nsAttrHashKey::KeyType aKey, nsIDOMNode *aData, void* aUserArg) { nsCOMPtr *attr = @@ -6756,7 +6756,7 @@ struct SubDocEnumArgs void *data; }; -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator SubDocHashEnum(PLDHashTable *table, PLDHashEntryHdr *hdr, PRUint32 number, void *arg) { @@ -6778,7 +6778,7 @@ nsDocument::EnumerateSubDocuments(nsSubDocEnumFunc aCallback, void *aData) } } -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator CanCacheSubDocument(PLDHashTable *table, PLDHashEntryHdr *hdr, PRUint32 number, void *arg) { diff --git a/content/base/src/nsDocument.h b/content/base/src/nsDocument.h index 640b3ad73f38..197ac9cccdbe 100644 --- a/content/base/src/nsDocument.h +++ b/content/base/src/nsDocument.h @@ -136,9 +136,9 @@ PR_BEGIN_EXTERN_C functions. That's the only way in which they differ from PLHandleEventProc and PLDestroyEventProc. */ typedef void* -(PR_CALLBACK EventHandlerFunc)(PLEvent* self); +(EventHandlerFunc)(PLEvent* self); typedef void -(PR_CALLBACK EventDestructorFunc)(PLEvent* self); +(EventDestructorFunc)(PLEvent* self); PR_END_EXTERN_C /** diff --git a/content/base/src/nsGenericElement.cpp b/content/base/src/nsGenericElement.cpp index 048ea3a59239..2f662c869e18 100644 --- a/content/base/src/nsGenericElement.cpp +++ b/content/base/src/nsGenericElement.cpp @@ -5072,8 +5072,7 @@ ParseSelectorList(nsINode* aNode, * the callbacks returns false, the iteration should be stopped. */ typedef PRBool -(* PR_CALLBACK ElementMatchedCallback)(nsIContent* aMatchingElement, - void* aClosure); +(* ElementMatchedCallback)(nsIContent* aMatchingElement, void* aClosure); // returning false means stop iteration static PRBool @@ -5169,7 +5168,7 @@ TryMatchingElementsInSubtree(nsINode* aRoot, return continueIteration; } -PR_STATIC_CALLBACK(PRBool) +static PRBool FindFirstMatchingElement(nsIContent* aMatchingElement, void* aClosure) { @@ -5205,7 +5204,7 @@ nsGenericElement::doQuerySelector(nsINode* aRoot, const nsAString& aSelector, return NS_OK; } -PR_STATIC_CALLBACK(PRBool) +static PRBool AppendAllMatchingElements(nsIContent* aMatchingElement, void* aClosure) { diff --git a/content/base/src/nsNodeInfoManager.h b/content/base/src/nsNodeInfoManager.h index f68bcdd25086..bacd82f9c3ce 100644 --- a/content/base/src/nsNodeInfoManager.h +++ b/content/base/src/nsNodeInfoManager.h @@ -151,9 +151,8 @@ protected: void SetDocumentPrincipal(nsIPrincipal *aPrincipal); private: - static PRIntn PR_CALLBACK NodeInfoInnerKeyCompare(const void *key1, - const void *key2); - static PLHashNumber PR_CALLBACK GetNodeInfoInnerHashValue(const void *key); + static PRIntn NodeInfoInnerKeyCompare(const void *key1, const void *key2); + static PLHashNumber GetNodeInfoInnerHashValue(const void *key); nsAutoRefCnt mRefCnt; NS_DECL_OWNINGTHREAD diff --git a/content/base/src/nsNodeUtils.cpp b/content/base/src/nsNodeUtils.cpp index 6c8c59a1f0d2..4ecbcaf739c8 100755 --- a/content/base/src/nsNodeUtils.cpp +++ b/content/base/src/nsNodeUtils.cpp @@ -458,7 +458,7 @@ public: nsCOMArray &mNodesWithProperties; }; -PLDHashOperator PR_CALLBACK +PLDHashOperator AdoptFunc(nsAttrHashKey::KeyType aKey, nsIDOMNode *aData, void* aUserArg) { nsCOMPtr attr = do_QueryInterface(aData); diff --git a/content/base/src/nsNodeUtils.h b/content/base/src/nsNodeUtils.h index 4dac9f03f150..ac0bc25cee4e 100755 --- a/content/base/src/nsNodeUtils.h +++ b/content/base/src/nsNodeUtils.h @@ -270,7 +270,7 @@ public: static void UnlinkUserData(nsINode *aNode); private: - friend PLDHashOperator PR_CALLBACK + friend PLDHashOperator AdoptFunc(nsAttrHashKey::KeyType aKey, nsIDOMNode *aData, void* aUserArg); /** diff --git a/content/base/src/nsPropertyTable.cpp b/content/base/src/nsPropertyTable.cpp index 2fc62d6c0aa1..56d2043b9097 100644 --- a/content/base/src/nsPropertyTable.cpp +++ b/content/base/src/nsPropertyTable.cpp @@ -324,7 +324,7 @@ nsPropertyTable::PropertyList::~PropertyList() } -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator DestroyPropertyEnumerator(PLDHashTable *table, PLDHashEntryHdr *hdr, PRUint32 number, void *arg) { diff --git a/content/base/src/nsXMLNameSpaceMap.cpp b/content/base/src/nsXMLNameSpaceMap.cpp index 5e62e2e6dfb2..025709e135d9 100755 --- a/content/base/src/nsXMLNameSpaceMap.cpp +++ b/content/base/src/nsXMLNameSpaceMap.cpp @@ -182,7 +182,7 @@ nsXMLNameSpaceMap::FindPrefix(PRInt32 aNameSpaceID) const return nsnull; } -PR_STATIC_CALLBACK(PRBool) DeleteEntry(void *aElement, void *aData) +static PRBool DeleteEntry(void *aElement, void *aData) { delete static_cast(aElement); return PR_TRUE; diff --git a/content/events/src/nsDOMDataContainerEvent.h b/content/events/src/nsDOMDataContainerEvent.h index 1a5e742fb89d..774e92d35397 100644 --- a/content/events/src/nsDOMDataContainerEvent.h +++ b/content/events/src/nsDOMDataContainerEvent.h @@ -57,7 +57,7 @@ public: NS_DECL_NSIDOMDATACONTAINEREVENT private: - static PLDHashOperator PR_CALLBACK + static PLDHashOperator TraverseEntry(const nsAString& aKey, nsIVariant *aDataItem, void* aUserArg); nsInterfaceHashtable mData; diff --git a/content/events/src/nsXMLEventsManager.cpp b/content/events/src/nsXMLEventsManager.cpp index 6f2340b50533..1195066d9149 100644 --- a/content/events/src/nsXMLEventsManager.cpp +++ b/content/events/src/nsXMLEventsManager.cpp @@ -251,18 +251,18 @@ nsXMLEventsListener::HandleEvent(nsIDOMEvent* aEvent) //XMLEventsManager / DocumentObserver -PR_STATIC_CALLBACK(PLDHashOperator) EnumAndUnregisterListener(nsISupports * aContent, - nsCOMPtr & aListener, - void * aData) +static PLDHashOperator EnumAndUnregisterListener(nsISupports * aContent, + nsCOMPtr & aListener, + void * aData) { if (aListener) aListener->Unregister(); return PL_DHASH_NEXT; } -PR_STATIC_CALLBACK(PLDHashOperator) EnumAndSetIncomplete(nsISupports * aContent, - nsCOMPtr & aListener, - void * aData) +static PLDHashOperator EnumAndSetIncomplete(nsISupports * aContent, + nsCOMPtr & aListener, + void * aData) { if (aListener && aData) { nsCOMPtr content = static_cast(aData); diff --git a/content/html/content/src/nsHTMLFormElement.cpp b/content/html/content/src/nsHTMLFormElement.cpp index f06140cc7bf2..efce6b55d1f0 100644 --- a/content/html/content/src/nsHTMLFormElement.cpp +++ b/content/html/content/src/nsHTMLFormElement.cpp @@ -527,7 +527,7 @@ nsHTMLFormElement::Init() // nsISupports -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator ElementTraverser(const nsAString& key, nsIDOMHTMLInputElement* element, void* userArg) { @@ -2092,7 +2092,7 @@ nsFormControlList::FlushPendingNotifications() } } -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator ControlTraverser(const nsAString& key, nsISupports* control, void* userArg) { nsCycleCollectionTraversalCallback *cb = diff --git a/content/html/content/src/nsHTMLTableRowElement.cpp b/content/html/content/src/nsHTMLTableRowElement.cpp index bc4d72fff68f..12f3c9835884 100644 --- a/content/html/content/src/nsHTMLTableRowElement.cpp +++ b/content/html/content/src/nsHTMLTableRowElement.cpp @@ -229,7 +229,7 @@ nsHTMLTableRowElement::GetSectionRowIndex(PRInt32* aValue) return NS_OK; } -PR_STATIC_CALLBACK(PRBool) +static PRBool IsCell(nsIContent *aContent, PRInt32 aNamespaceID, nsIAtom* aAtom, void *aData) { diff --git a/content/html/document/src/nsHTMLDocument.cpp b/content/html/document/src/nsHTMLDocument.cpp index 5d3ff6fa7247..48dff49ad02b 100644 --- a/content/html/document/src/nsHTMLDocument.cpp +++ b/content/html/document/src/nsHTMLDocument.cpp @@ -177,7 +177,7 @@ static PRBool ConvertToMidasInternalCommand(const nsAString & inCommandID, static PRBool ConvertToMidasInternalCommand(const nsAString & inCommandID, nsACString& outCommandID); -static int PR_CALLBACK +static int MyPrefChangedCallback(const char*aPrefName, void* instance_data) { const nsAdoptingString& detector_name = diff --git a/content/xbl/src/nsBindingManager.cpp b/content/xbl/src/nsBindingManager.cpp index db64237c30ec..43161bd1634d 100644 --- a/content/xbl/src/nsBindingManager.cpp +++ b/content/xbl/src/nsBindingManager.cpp @@ -231,14 +231,14 @@ private: nsCOMPtr mValue; }; -PR_STATIC_CALLBACK(void) +static void ClearObjectEntry(PLDHashTable* table, PLDHashEntryHdr *entry) { ObjectEntry* objEntry = static_cast(entry); objEntry->~ObjectEntry(); } -PR_STATIC_CALLBACK(PRBool) +static PRBool InitObjectEntry(PLDHashTable* table, PLDHashEntryHdr* entry, const void* key) { new (entry) ObjectEntry; @@ -448,8 +448,8 @@ nsBindingManager::~nsBindingManager(void) } PLDHashOperator -PR_CALLBACK RemoveInsertionParentCB(PLDHashTable* aTable, PLDHashEntryHdr* aEntry, - PRUint32 aNumber, void* aArg) +RemoveInsertionParentCB(PLDHashTable* aTable, PLDHashEntryHdr* aEntry, + PRUint32 aNumber, void* aArg) { return (static_cast(aEntry)->GetValue() == static_cast(aArg)) ? PL_DHASH_REMOVE : PL_DHASH_NEXT; @@ -1018,7 +1018,7 @@ struct BindingTableReadClosure nsBindingList mBindings; }; -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator AccumulateBindingsToDetach(nsISupports *aKey, nsXBLBinding *aBinding, void* aClosure) { @@ -1109,7 +1109,7 @@ nsBindingManager::RemoveLoadingDocListener(nsIURI* aURL) } } -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator MarkForDeath(nsISupports *aKey, nsXBLBinding *aBinding, void* aClosure) { if (aBinding->MarkedForDeath()) @@ -1299,7 +1299,7 @@ nsBindingManager::WalkRules(nsIStyleRuleProcessor::EnumFunc aFunc, typedef nsTHashtable RuleProcessorSet; -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator EnumRuleProcessors(nsISupports *aKey, nsXBLBinding *aBinding, void* aClosure) { RuleProcessorSet *set = static_cast(aClosure); @@ -1321,7 +1321,7 @@ struct MediumFeaturesChangedData { PRBool *mRulesChanged; }; -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator EnumMediumFeaturesChanged(nsVoidPtrHashKey *aKey, void* aClosure) { nsIStyleRuleProcessor *ruleProcessor = diff --git a/content/xbl/src/nsXBLBinding.cpp b/content/xbl/src/nsXBLBinding.cpp index 49aa67613de2..1b27c0a04bf0 100644 --- a/content/xbl/src/nsXBLBinding.cpp +++ b/content/xbl/src/nsXBLBinding.cpp @@ -287,7 +287,7 @@ nsXBLBinding::~nsXBLBinding(void) NS_RELEASE(info); } -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator TraverseKey(nsISupports* aKey, nsInsertionPointList* aData, void* aClosure) { nsCycleCollectionTraversalCallback &cb = @@ -407,7 +407,7 @@ struct ContentListData : public EnumData { {} }; -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator BuildContentLists(nsISupports* aKey, nsAutoPtr& aData, void* aClosure) @@ -500,7 +500,7 @@ BuildContentLists(nsISupports* aKey, return PL_DHASH_NEXT; } -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator RealizeDefaultContent(nsISupports* aKey, nsAutoPtr& aData, void* aClosure) @@ -561,7 +561,7 @@ RealizeDefaultContent(nsISupports* aKey, return PL_DHASH_NEXT; } -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator ChangeDocumentForDefaultContent(nsISupports* aKey, nsAutoPtr& aData, void* aClosure) diff --git a/content/xbl/src/nsXBLDocumentInfo.cpp b/content/xbl/src/nsXBLDocumentInfo.cpp index 99a9cb36f0dc..70c79c7572e5 100644 --- a/content/xbl/src/nsXBLDocumentInfo.cpp +++ b/content/xbl/src/nsXBLDocumentInfo.cpp @@ -127,7 +127,7 @@ nsXBLDocGlobalObject::doCheckAccess(JSContext *cx, JSObject *obj, jsval id, PRUi return NS_SUCCEEDED(rv); } -PR_STATIC_CALLBACK(JSBool) +static JSBool nsXBLDocGlobalObject_getProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { @@ -135,7 +135,7 @@ nsXBLDocGlobalObject_getProperty(JSContext *cx, JSObject *obj, doCheckAccess(cx, obj, id, nsIXPCSecurityManager::ACCESS_GET_PROPERTY); } -PR_STATIC_CALLBACK(JSBool) +static JSBool nsXBLDocGlobalObject_setProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { @@ -143,7 +143,7 @@ nsXBLDocGlobalObject_setProperty(JSContext *cx, JSObject *obj, doCheckAccess(cx, obj, id, nsIXPCSecurityManager::ACCESS_SET_PROPERTY); } -PR_STATIC_CALLBACK(JSBool) +static JSBool nsXBLDocGlobalObject_checkAccess(JSContext *cx, JSObject *obj, jsval id, JSAccessMode mode, jsval *vp) { @@ -158,7 +158,7 @@ nsXBLDocGlobalObject_checkAccess(JSContext *cx, JSObject *obj, jsval id, doCheckAccess(cx, obj, id, translated); } -PR_STATIC_CALLBACK(void) +static void nsXBLDocGlobalObject_finalize(JSContext *cx, JSObject *obj) { nsISupports *nativeThis = (nsISupports*)JS_GetPrivate(cx, obj); @@ -172,7 +172,7 @@ nsXBLDocGlobalObject_finalize(JSContext *cx, JSObject *obj) NS_RELEASE(nativeThis); } -PR_STATIC_CALLBACK(JSBool) +static JSBool nsXBLDocGlobalObject_resolve(JSContext *cx, JSObject *obj, jsval id) { JSBool did_resolve = JS_FALSE; @@ -434,7 +434,7 @@ static PRBool IsChromeURI(nsIURI* aURI) /* Implementation file */ -static PRIntn PR_CALLBACK +static PRIntn TraverseProtos(nsHashKey *aKey, void *aData, void* aClosure) { nsCycleCollectionTraversalCallback *cb = @@ -444,7 +444,7 @@ TraverseProtos(nsHashKey *aKey, void *aData, void* aClosure) return kHashEnumerateNext; } -static PRIntn PR_CALLBACK +static PRIntn UnlinkProtoJSObjects(nsHashKey *aKey, void *aData, void* aClosure) { nsXBLPrototypeBinding *proto = static_cast(aData); @@ -458,7 +458,7 @@ struct ProtoTracer void *mClosure; }; -static PRIntn PR_CALLBACK +static PRIntn TraceProtos(nsHashKey *aKey, void *aData, void* aClosure) { ProtoTracer* closure = static_cast(aClosure); @@ -557,7 +557,7 @@ nsXBLDocumentInfo::GetPrototypeBinding(const nsACString& aRef, nsXBLPrototypeBin return NS_OK; } -static PRBool PR_CALLBACK +static PRBool DeletePrototypeBinding(nsHashKey* aKey, void* aData, void* aClosure) { nsXBLPrototypeBinding* binding = static_cast(aData); @@ -592,7 +592,7 @@ nsXBLDocumentInfo::SetFirstPrototypeBinding(nsXBLPrototypeBinding* aBinding) return NS_OK; } -PRBool PR_CALLBACK FlushScopedSkinSheets(nsHashKey* aKey, void* aData, void* aClosure) +PRBool FlushScopedSkinSheets(nsHashKey* aKey, void* aData, void* aClosure) { nsXBLPrototypeBinding* proto = (nsXBLPrototypeBinding*)aData; proto->FlushSkinSheets(); diff --git a/content/xbl/src/nsXBLPrototypeBinding.cpp b/content/xbl/src/nsXBLPrototypeBinding.cpp index 2117b8433820..7b319b18e342 100644 --- a/content/xbl/src/nsXBLPrototypeBinding.cpp +++ b/content/xbl/src/nsXBLPrototypeBinding.cpp @@ -332,7 +332,7 @@ nsXBLPrototypeBinding::Init(const nsACString& aID, return NS_OK; } -PR_STATIC_CALLBACK(PRIntn) +static PRIntn TraverseInsertionPoint(nsHashKey* aKey, void* aData, void* aClosure) { nsCycleCollectionTraversalCallback &cb = @@ -345,7 +345,7 @@ TraverseInsertionPoint(nsHashKey* aKey, void* aData, void* aClosure) return kHashEnumerateNext; } -PR_STATIC_CALLBACK(PRBool) +static PRBool TraverseBinding(nsHashKey *aKey, void *aData, void* aClosure) { nsCycleCollectionTraversalCallback *cb = @@ -646,7 +646,7 @@ struct InsertionData { :mBinding(aBinding), mPrototype(aPrototype) {} }; -PRBool PR_CALLBACK InstantiateInsertionPoint(nsHashKey* aKey, void* aData, void* aClosure) +PRBool InstantiateInsertionPoint(nsHashKey* aKey, void* aData, void* aClosure) { nsXBLInsertionPointEntry* entry = static_cast(aData); InsertionData* data = static_cast(aClosure); @@ -946,7 +946,7 @@ struct nsXBLAttrChangeData }; // XXXbz this duplicates lots of AttributeChanged -PRBool PR_CALLBACK SetAttrs(nsHashKey* aKey, void* aData, void* aClosure) +PRBool SetAttrs(nsHashKey* aKey, void* aData, void* aClosure) { nsXBLAttributeEntry* entry = static_cast(aData); nsXBLAttrChangeData* changeData = static_cast(aClosure); @@ -1012,7 +1012,7 @@ PRBool PR_CALLBACK SetAttrs(nsHashKey* aKey, void* aData, void* aClosure) return PR_TRUE; } -PRBool PR_CALLBACK SetAttrsNS(nsHashKey* aKey, void* aData, void* aClosure) +PRBool SetAttrsNS(nsHashKey* aKey, void* aData, void* aClosure) { if (aData && aClosure) { nsPRUint32Key * key = static_cast(aKey); @@ -1072,14 +1072,14 @@ nsXBLPrototypeBinding::ShouldBuildChildFrames() const return PR_TRUE; } -static PRBool PR_CALLBACK +static PRBool DeleteAttributeEntry(nsHashKey* aKey, void* aData, void* aClosure) { nsXBLAttributeEntry::Destroy(static_cast(aData)); return PR_TRUE; } -static PRBool PR_CALLBACK +static PRBool DeleteAttributeTable(nsHashKey* aKey, void* aData, void* aClosure) { delete static_cast(aData); @@ -1203,7 +1203,7 @@ nsXBLPrototypeBinding::ConstructAttributeTable(nsIContent* aElement) } } -static PRBool PR_CALLBACK +static PRBool DeleteInsertionPointEntry(nsHashKey* aKey, void* aData, void* aClosure) { static_cast(aData)->Release(); diff --git a/content/xslt/src/xml/txXMLParser.cpp b/content/xslt/src/xml/txXMLParser.cpp index c6b94985115a..4155fab876bd 100644 --- a/content/xslt/src/xml/txXMLParser.cpp +++ b/content/xslt/src/xml/txXMLParser.cpp @@ -158,42 +158,42 @@ txParseFromStream(istream& aInputStream, const nsAString& aUri, } \ PR_END_MACRO -PR_STATIC_CALLBACK(void) +static void startElement(void *aUserData, const XML_Char *aName, const XML_Char **aAtts) { TX_ENSURE_DATA(aUserData); TX_XMLPARSER(aUserData)->StartElement(aName, aAtts); } -PR_STATIC_CALLBACK(void) +static void endElement(void *aUserData, const XML_Char* aName) { TX_ENSURE_DATA(aUserData); TX_XMLPARSER(aUserData)->EndElement(aName); } -PR_STATIC_CALLBACK(void) +static void charData(void* aUserData, const XML_Char* aChars, int aLength) { TX_ENSURE_DATA(aUserData); TX_XMLPARSER(aUserData)->CharacterData(aChars, aLength); } -PR_STATIC_CALLBACK(void) +static void commentHandler(void* aUserData, const XML_Char* aChars) { TX_ENSURE_DATA(aUserData); TX_XMLPARSER(aUserData)->Comment(aChars); } -PR_STATIC_CALLBACK(void) +static void piHandler(void *aUserData, const XML_Char *aTarget, const XML_Char *aData) { TX_ENSURE_DATA(aUserData); TX_XMLPARSER(aUserData)->ProcessingInstruction(aTarget, aData); } -PR_STATIC_CALLBACK(int) +static int externalEntityRefHandler(XML_Parser aParser, const XML_Char *aContext, const XML_Char *aBase, diff --git a/content/xslt/src/xslt/txBufferingHandler.cpp b/content/xslt/src/xslt/txBufferingHandler.cpp index 8cfc672d126e..402eabef4668 100644 --- a/content/xslt/src/xslt/txBufferingHandler.cpp +++ b/content/xslt/src/xslt/txBufferingHandler.cpp @@ -343,7 +343,7 @@ txBufferingHandler::startElement(nsIAtom* aPrefix, return mBuffer->addTransaction(transaction); } -PR_STATIC_CALLBACK(PRBool) +static PRBool deleteTransaction(void* aElement, void *aData) { delete static_cast(aElement); @@ -371,7 +371,7 @@ struct Holder nsAFlatString::const_char_iterator mIter; }; -PR_STATIC_CALLBACK(PRBool) +static PRBool flushTransaction(void* aElement, void *aData) { Holder* holder = static_cast(aData); diff --git a/content/xslt/src/xslt/txStandaloneStylesheetCompiler.cpp b/content/xslt/src/xslt/txStandaloneStylesheetCompiler.cpp index f5b90e8a10ea..11347fbbfd06 100644 --- a/content/xslt/src/xslt/txStandaloneStylesheetCompiler.cpp +++ b/content/xslt/src/xslt/txStandaloneStylesheetCompiler.cpp @@ -119,7 +119,7 @@ TX_CompileStylesheetPath(const txParsedURL& aURL, txStylesheet** aResult) // shortcut macro for redirection into txDriver method calls #define TX_DRIVER(_userData) static_cast(_userData) -PR_STATIC_CALLBACK(void) +static void startElement(void *aUserData, const XML_Char *aName, const XML_Char **aAtts) { if (!aUserData) { @@ -129,7 +129,7 @@ startElement(void *aUserData, const XML_Char *aName, const XML_Char **aAtts) TX_DRIVER(aUserData)->StartElement(aName, aAtts); } -PR_STATIC_CALLBACK(void) +static void endElement(void *aUserData, const XML_Char* aName) { if (!aUserData) { @@ -139,7 +139,7 @@ endElement(void *aUserData, const XML_Char* aName) TX_DRIVER(aUserData)->EndElement(aName); } -PR_STATIC_CALLBACK(void) +static void charData(void* aUserData, const XML_Char* aChars, int aLength) { if (!aUserData) { @@ -149,7 +149,7 @@ charData(void* aUserData, const XML_Char* aChars, int aLength) TX_DRIVER(aUserData)->CharacterData(aChars, aLength); } -PR_STATIC_CALLBACK(int) +static int externalEntityRefHandler(XML_Parser aParser, const XML_Char *aContext, const XML_Char *aBase, diff --git a/content/xul/document/src/nsXULDocument.cpp b/content/xul/document/src/nsXULDocument.cpp index 68f543c11785..95cfe93c9687 100644 --- a/content/xul/document/src/nsXULDocument.cpp +++ b/content/xul/document/src/nsXULDocument.cpp @@ -306,7 +306,7 @@ NS_NewXULDocument(nsIXULDocument** result) NS_IMPL_CYCLE_COLLECTION_CLASS(nsXULDocument) -static PLDHashOperator PR_CALLBACK +static PLDHashOperator TraverseTemplateBuilders(nsISupports* aKey, nsIXULTemplateBuilder* aData, void* aContext) { @@ -321,7 +321,7 @@ TraverseTemplateBuilders(nsISupports* aKey, nsIXULTemplateBuilder* aData, return PL_DHASH_NEXT; } -static PLDHashOperator PR_CALLBACK +static PLDHashOperator TraverseObservers(nsIURI* aKey, nsIObserver* aData, void* aContext) { nsCycleCollectionTraversalCallback *cb = @@ -647,7 +647,7 @@ nsXULDocument::OnDocumentParserError() return PR_TRUE; } -PR_STATIC_CALLBACK(void) +static void ClearBroadcasterMapEntry(PLDHashTable* aTable, PLDHashEntryHdr* aEntry) { BroadcasterMapEntry* entry = @@ -2791,7 +2791,7 @@ nsXULDocument::LoadOverlayInternal(nsIURI* aURI, PRBool aIsDynamic, return NS_OK; } -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator FirePendingMergeNotification(nsIURI* aKey, nsCOMPtr& aObserver, void* aClosure) { aObserver->Observe(aKey, "xul-overlay-merged", EmptyString().get()); diff --git a/content/xul/document/src/nsXULPrototypeCache.cpp b/content/xul/document/src/nsXULPrototypeCache.cpp index e71f435e670c..4b2c2341c66e 100644 --- a/content/xul/document/src/nsXULPrototypeCache.cpp +++ b/content/xul/document/src/nsXULPrototypeCache.cpp @@ -71,7 +71,7 @@ static const char kDisableXULCachePref[] = "nglayout.debug.disable_xul_cache"; //---------------------------------------------------------------------- -PR_STATIC_CALLBACK(int) +static int DisableXULCacheChangedCallback(const char* aPref, void* aClosure) { gDisableXULCache = @@ -270,7 +270,7 @@ nsXULPrototypeCache::GetScript(nsIURI* aURI, PRUint32 *aLangID) /* static */ -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator ReleaseScriptObjectCallback(nsIURI* aKey, CacheScriptEntry &aData, void* aClosure) { nsCOMPtr rt; @@ -328,7 +328,7 @@ nsXULPrototypeCache::PutXBLDocumentInfo(nsIXBLDocumentInfo* aDocumentInfo) return NS_OK; } -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator FlushSkinXBL(nsIURI* aKey, nsCOMPtr& aDocInfo, void* aClosure) { nsCAutoString str; @@ -343,7 +343,7 @@ FlushSkinXBL(nsIURI* aKey, nsCOMPtr& aDocInfo, void* aClosur return ret; } -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator FlushSkinSheets(nsIURI* aKey, nsCOMPtr& aSheet, void* aClosure) { nsCOMPtr uri; @@ -360,7 +360,7 @@ FlushSkinSheets(nsIURI* aKey, nsCOMPtr& aSheet, void* aClosure return ret; } -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator FlushScopedSkinStylesheets(nsIURI* aKey, nsCOMPtr &aDocInfo, void* aClosure) { aDocInfo->FlushSkinStylesheets(); @@ -581,7 +581,7 @@ nsXULPrototypeCache::StartFastLoadingURI(nsIURI* aURI, PRInt32 aDirectionFlags) return gFastLoadService->StartMuxedDocument(aURI, urlspec.get(), aDirectionFlags); } -PR_STATIC_CALLBACK(int) +static int FastLoadPrefChangedCallback(const char* aPref, void* aClosure) { PRBool wasEnabled = !gDisableXULFastLoad; diff --git a/content/xul/document/src/nsXULPrototypeDocument.cpp b/content/xul/document/src/nsXULPrototypeDocument.cpp index 2910e0dd9522..a4375438e34d 100644 --- a/content/xul/document/src/nsXULPrototypeDocument.cpp +++ b/content/xul/document/src/nsXULPrototypeDocument.cpp @@ -115,7 +115,7 @@ nsXULPDGlobalObject* nsXULPrototypeDocument::gSystemGlobal; PRUint32 nsXULPrototypeDocument::gRefCnt; -void PR_CALLBACK +void nsXULPDGlobalObject_finalize(JSContext *cx, JSObject *obj) { nsISupports *nativeThis = (nsISupports*)JS_GetPrivate(cx, obj); @@ -131,7 +131,7 @@ nsXULPDGlobalObject_finalize(JSContext *cx, JSObject *obj) } -JSBool PR_CALLBACK +JSBool nsXULPDGlobalObject_resolve(JSContext *cx, JSObject *obj, jsval id) { JSBool did_resolve = JS_FALSE; diff --git a/content/xul/templates/src/nsXULContentUtils.h b/content/xul/templates/src/nsXULContentUtils.h index ff336f87680c..e9f3f1887eff 100644 --- a/content/xul/templates/src/nsXULContentUtils.h +++ b/content/xul/templates/src/nsXULContentUtils.h @@ -71,7 +71,7 @@ protected: static PRBool gDisableXULCache; - static int PR_CALLBACK + static int DisableXULCacheChangedCallback(const char* aPrefName, void* aClosure); public: diff --git a/content/xul/templates/src/nsXULSortService.cpp b/content/xul/templates/src/nsXULSortService.cpp index 9506d9b8dbac..d13b956c81e5 100644 --- a/content/xul/templates/src/nsXULSortService.cpp +++ b/content/xul/templates/src/nsXULSortService.cpp @@ -223,7 +223,7 @@ XULSortServiceImpl::GetTemplateItemsToSort(nsIContent* aContainer, return NS_OK; } -int PR_CALLBACK +int testSortCallback(const void *data1, const void *data2, void *privateData) { /// Note: testSortCallback is a small C callback stub for NS_QuickSort diff --git a/content/xul/templates/src/nsXULTemplateQueryProcessorRDF.cpp b/content/xul/templates/src/nsXULTemplateQueryProcessorRDF.cpp index 03ab62ca2d0f..2547bbd01ffc 100755 --- a/content/xul/templates/src/nsXULTemplateQueryProcessorRDF.cpp +++ b/content/xul/templates/src/nsXULTemplateQueryProcessorRDF.cpp @@ -88,7 +88,7 @@ nsIRDFResource* nsXULTemplateQueryProcessorRDF::kRDF_type; NS_IMPL_CYCLE_COLLECTION_CLASS(nsXULTemplateQueryProcessorRDF) NS_IMPL_CYCLE_COLLECTION_UNLINK_0(nsXULTemplateQueryProcessorRDF) -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator BindingDependenciesTraverser(nsISupports* key, nsCOMArray* array, void* userArg) @@ -104,7 +104,7 @@ BindingDependenciesTraverser(nsISupports* key, return PL_DHASH_NEXT; } -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator MemoryElementTraverser(const PRUint32& key, nsCOMArray* array, void* userArg) @@ -120,7 +120,7 @@ MemoryElementTraverser(const PRUint32& key, return PL_DHASH_NEXT; } -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator RuleToBindingTraverser(nsISupports* key, RDFBindingSet* binding, void* userArg) { nsCycleCollectionTraversalCallback *cb = diff --git a/content/xul/templates/src/nsXULTreeBuilder.cpp b/content/xul/templates/src/nsXULTreeBuilder.cpp index a52ca9c8c344..b2e795f85d75 100644 --- a/content/xul/templates/src/nsXULTreeBuilder.cpp +++ b/content/xul/templates/src/nsXULTreeBuilder.cpp @@ -179,7 +179,7 @@ protected: /** * A sorting callback for NS_QuickSort(). */ - static int PR_CALLBACK + static int Compare(const void* aLeft, const void* aRight, void* aClosure); /** diff --git a/db/morkreader/nsMorkReader.cpp b/db/morkreader/nsMorkReader.cpp index 10d3bb9ed866..b66ac91873d5 100644 --- a/db/morkreader/nsMorkReader.cpp +++ b/db/morkreader/nsMorkReader.cpp @@ -145,7 +145,7 @@ nsMorkReader::Init() return NS_OK; } -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator DeleteStringArray(const nsCSubstring& aKey, nsTArray *aData, void *aUserArg) @@ -170,7 +170,7 @@ struct AddColumnClosure nsresult result; }; -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator AddColumn(const nsCSubstring &id, nsCString name, void *userData) { AddColumnClosure *closure = static_cast(userData); diff --git a/db/morkreader/nsMorkReader.h b/db/morkreader/nsMorkReader.h index 1c5c3735aed6..aabc24e1f353 100644 --- a/db/morkreader/nsMorkReader.h +++ b/db/morkreader/nsMorkReader.h @@ -128,9 +128,9 @@ class NS_STACK_CLASS nsMorkReader // The callback can return PL_DHASH_NEXT to continue enumerating, // or PL_DHASH_STOP to stop. typedef PLDHashOperator - (*PR_CALLBACK RowEnumerator)(const nsCSubstring &rowID, - const nsTArray *values, - void *userData); + (* RowEnumerator)(const nsCSubstring &rowID, + const nsTArray *values, + void *userData); // Initialize the importer object's data structures nsresult Init(); diff --git a/docshell/base/nsWebShell.cpp b/docshell/base/nsWebShell.cpp index 5778b72696d3..5d8a420b2021 100644 --- a/docshell/base/nsWebShell.cpp +++ b/docshell/base/nsWebShell.cpp @@ -634,7 +634,7 @@ nsWebShell::GetInterface(const nsIID &aIID, void** aInstancePtr) return nsDocShell::GetInterface(aIID, aInstancePtr); } -nsEventStatus PR_CALLBACK +nsEventStatus nsWebShell::HandleEvent(nsGUIEvent *aEvent) { return nsEventStatus_eIgnore; diff --git a/docshell/base/nsWebShell.h b/docshell/base/nsWebShell.h index 75eb1a0dad12..09645f4c272c 100644 --- a/docshell/base/nsWebShell.h +++ b/docshell/base/nsWebShell.h @@ -100,7 +100,7 @@ public: NS_IMETHOD Create(); - static nsEventStatus PR_CALLBACK HandleEvent(nsGUIEvent *aEvent); + static nsEventStatus HandleEvent(nsGUIEvent *aEvent); // NS_IMETHOD SetURL(const PRUnichar* aURL); diff --git a/docshell/build/nsDocShellModule.cpp b/docshell/build/nsDocShellModule.cpp index 7df39288a5c2..d39709074280 100644 --- a/docshell/build/nsDocShellModule.cpp +++ b/docshell/build/nsDocShellModule.cpp @@ -76,7 +76,7 @@ static PRBool gInitialized = PR_FALSE; // The one time initialization for this module // static -PR_STATIC_CALLBACK(nsresult) +static nsresult Initialize(nsIModule* aSelf) { NS_PRECONDITION(!gInitialized, "docshell module already initialized"); @@ -92,7 +92,7 @@ Initialize(nsIModule* aSelf) return rv; } -PR_STATIC_CALLBACK(void) +static void Shutdown(nsIModule* aSelf) { nsSHEntry::Shutdown(); diff --git a/docshell/shistory/src/nsSHEntry.cpp b/docshell/shistory/src/nsSHEntry.cpp index 7d807bc48a1f..fca0d204c1bc 100644 --- a/docshell/shistory/src/nsSHEntry.cpp +++ b/docshell/shistory/src/nsSHEntry.cpp @@ -139,7 +139,7 @@ nsSHEntry::nsSHEntry(const nsSHEntry &other) { } -PR_STATIC_CALLBACK(PRBool) +static PRBool ClearParentPtr(nsISHEntry* aEntry, void* /* aData */) { if (aEntry) { diff --git a/dom/src/base/nsGlobalWindow.cpp b/dom/src/base/nsGlobalWindow.cpp index c8da60c1fd87..8d16510e59af 100644 --- a/dom/src/base/nsGlobalWindow.cpp +++ b/dom/src/base/nsGlobalWindow.cpp @@ -1067,7 +1067,7 @@ struct TraceData void* closure; }; -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator TraceXBLHandlers(const void* aKey, void* aData, void* aClosure) { TraceData* data = static_cast(aClosure); @@ -6932,7 +6932,7 @@ nsGlobalWindow::Observe(nsISupports* aSubject, const char* aTopic, return NS_ERROR_FAILURE; } -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator FirePendingStorageEvents(const nsAString& aKey, PRBool aData, void *userArg) { nsGlobalWindow *win = static_cast(userArg); diff --git a/dom/src/base/nsJSEnvironment.cpp b/dom/src/base/nsJSEnvironment.cpp index 5ed27a767626..327e73b19a80 100644 --- a/dom/src/base/nsJSEnvironment.cpp +++ b/dom/src/base/nsJSEnvironment.cpp @@ -1135,7 +1135,7 @@ static const char js_zeal_option_str[] = JS_OPTIONS_DOT_STR "gczeal"; static const char js_jit_content_str[] = JS_OPTIONS_DOT_STR "jit.content"; static const char js_jit_chrome_str[] = JS_OPTIONS_DOT_STR "jit.chrome"; -int PR_CALLBACK +int nsJSContext::JSOptionChangedCallback(const char *pref, void *data) { nsJSContext *context = reinterpret_cast(data); @@ -3699,7 +3699,7 @@ nsJSRuntime::Startup() gCollation = nsnull; } -static int PR_CALLBACK +static int MaxScriptRunTimePrefChangedCallback(const char *aPrefName, void *aClosure) { // Default limit on script run time to 10 seconds. 0 means let @@ -3725,7 +3725,7 @@ MaxScriptRunTimePrefChangedCallback(const char *aPrefName, void *aClosure) return 0; } -static int PR_CALLBACK +static int ReportAllJSExceptionsPrefChangedCallback(const char* aPrefName, void* aClosure) { PRBool reportAll = nsContentUtils::GetBoolPref(aPrefName, PR_FALSE); diff --git a/dom/src/base/nsJSEnvironment.h b/dom/src/base/nsJSEnvironment.h index 432b3d0a3090..8d35940d765e 100644 --- a/dom/src/base/nsJSEnvironment.h +++ b/dom/src/base/nsJSEnvironment.h @@ -292,7 +292,7 @@ private: nsCOMPtr mGlobalWrapperRef; - static int PR_CALLBACK JSOptionChangedCallback(const char *pref, void *data); + static int JSOptionChangedCallback(const char *pref, void *data); static JSBool DOMOperationCallback(JSContext *cx); }; diff --git a/dom/src/base/nsScriptNameSpaceManager.cpp b/dom/src/base/nsScriptNameSpaceManager.cpp index a4d0a62b0d3e..85c9f4ac0cbb 100644 --- a/dom/src/base/nsScriptNameSpaceManager.cpp +++ b/dom/src/base/nsScriptNameSpaceManager.cpp @@ -68,7 +68,7 @@ public: }; -PR_STATIC_CALLBACK(PLDHashNumber) +static PLDHashNumber GlobalNameHashHashKey(PLDHashTable *table, const void *key) { const nsAString *str = static_cast(key); @@ -76,7 +76,7 @@ GlobalNameHashHashKey(PLDHashTable *table, const void *key) return HashString(*str); } -PR_STATIC_CALLBACK(PRBool) +static PRBool GlobalNameHashMatchEntry(PLDHashTable *table, const PLDHashEntryHdr *entry, const void *key) { @@ -87,7 +87,7 @@ GlobalNameHashMatchEntry(PLDHashTable *table, const PLDHashEntryHdr *entry, return str->Equals(e->mKey); } -PR_STATIC_CALLBACK(void) +static void GlobalNameHashClearEntry(PLDHashTable *table, PLDHashEntryHdr *entry) { GlobalNameMapEntry *e = static_cast(entry); @@ -116,7 +116,7 @@ GlobalNameHashClearEntry(PLDHashTable *table, PLDHashEntryHdr *entry) memset(&e->mGlobalName, 0, sizeof(nsGlobalNameStruct)); } -PR_STATIC_CALLBACK(PRBool) +static PRBool GlobalNameHashInitEntry(PLDHashTable *table, PLDHashEntryHdr *entry, const void *key) { @@ -510,7 +510,7 @@ struct NameSetClosure { nsresult rv; }; -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator NameSetInitCallback(PLDHashTable *table, PLDHashEntryHdr *hdr, PRUint32 number, void *arg) { diff --git a/dom/src/storage/nsDOMStorage.cpp b/dom/src/storage/nsDOMStorage.cpp index de1d79efc908..b41f701c3fdd 100644 --- a/dom/src/storage/nsDOMStorage.cpp +++ b/dom/src/storage/nsDOMStorage.cpp @@ -228,7 +228,7 @@ nsDOMStorageManager::Shutdown() #endif } -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator ClearStorage(nsDOMStorageEntry* aEntry, void* userArg) { aEntry->mStorage->ClearAll(); @@ -364,7 +364,7 @@ nsDOMStorageEntry::~nsDOMStorageEntry() { } -PLDHashOperator PR_CALLBACK +PLDHashOperator SessionStorageTraverser(nsSessionStorageEntry* aEntry, void* userArg) { nsCycleCollectionTraversalCallback *cb = static_cast(userArg); @@ -510,7 +510,7 @@ private: ItemCounterState(); // Not to be implemented }; -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator ItemCounter(nsSessionStorageEntry* aEntry, void* userArg) { ItemCounterState *state = (ItemCounterState *)userArg; @@ -558,7 +558,7 @@ private: IndexFinderData(); // Not to be implemented }; -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator IndexFinder(nsSessionStorageEntry* aEntry, void* userArg) { IndexFinderData *data = (IndexFinderData *)userArg; @@ -931,7 +931,7 @@ nsDOMStorage::SetSecure(const nsAString& aKey, PRBool aSecure) return NS_OK; } -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator ClearStorageItem(nsSessionStorageEntry* aEntry, void* userArg) { aEntry->mItem->SetValueInternal(EmptyString()); @@ -944,7 +944,7 @@ nsDOMStorage::ClearAll() mItems.EnumerateEntries(ClearStorageItem, nsnull); } -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator CopyStorageItems(nsSessionStorageEntry* aEntry, void* userArg) { nsDOMStorage* newstorage = static_cast(userArg); @@ -984,7 +984,7 @@ struct KeysArrayBuilderStruct nsTArray *keys; }; -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator KeysArrayBuilder(nsSessionStorageEntry* aEntry, void* userArg) { KeysArrayBuilderStruct *keystruct = (KeysArrayBuilderStruct *)userArg; diff --git a/embedding/browser/activex/src/common/IEHtmlNode.cpp b/embedding/browser/activex/src/common/IEHtmlNode.cpp index c83a123d2704..5922c9fd4d32 100644 --- a/embedding/browser/activex/src/common/IEHtmlNode.cpp +++ b/embedding/browser/activex/src/common/IEHtmlNode.cpp @@ -43,12 +43,12 @@ static PLHashTable *g_NodeLookupTable; -static PLHashNumber PR_CALLBACK HashFunction(const void *key) +static PLHashNumber HashFunction(const void *key) { return (PRUint32) key; } -PRIntn PR_CALLBACK HashComparator(const void *v1, const void *v2) +PRIntn HashComparator(const void *v1, const void *v2) { if (v1 == v2) { diff --git a/embedding/browser/activex/src/plugin/XPConnect.cpp b/embedding/browser/activex/src/plugin/XPConnect.cpp index 0620194ed363..1660340e2626 100644 --- a/embedding/browser/activex/src/plugin/XPConnect.cpp +++ b/embedding/browser/activex/src/plugin/XPConnect.cpp @@ -376,7 +376,7 @@ nsScriptablePeer::ConvertVariants(VARIANT *aIn, nsIVariant **aOut) if (hlib) { nsIComponentManager *pManager = nsnull; // A frozen interface, even in 1.0.x - typedef nsresult (PR_CALLBACK *Moz1XGetComponentManagerFunc)(nsIComponentManager* *result); + typedef nsresult (*Moz1XGetComponentManagerFunc)(nsIComponentManager* *result); Moz1XGetComponentManagerFunc compMgr = (Moz1XGetComponentManagerFunc) ::GetProcAddress(hlib, "NS_GetComponentManager"); if (compMgr) diff --git a/embedding/browser/photon/src/PtMozilla.cpp b/embedding/browser/photon/src/PtMozilla.cpp index 3b179223266b..d00a5e427fca 100644 --- a/embedding/browser/photon/src/PtMozilla.cpp +++ b/embedding/browser/photon/src/PtMozilla.cpp @@ -94,7 +94,7 @@ #ifdef _BUILD_STATIC_BIN #include "nsStaticComponent.h" -nsresult PR_CALLBACK +nsresult ph_getModuleInfo(nsStaticModuleInfo **info, PRUint32 *count); #endif diff --git a/embedding/browser/webBrowser/nsWebBrowser.cpp b/embedding/browser/webBrowser/nsWebBrowser.cpp index b31ae17489c1..e1347432a4ac 100644 --- a/embedding/browser/webBrowser/nsWebBrowser.cpp +++ b/embedding/browser/webBrowser/nsWebBrowser.cpp @@ -123,7 +123,7 @@ nsWebBrowser::~nsWebBrowser() InternalDestroy(); } -PRBool PR_CALLBACK deleteListener(void *aElement, void *aData) { +PRBool deleteListener(void *aElement, void *aData) { nsWebBrowserListenerState *state = (nsWebBrowserListenerState*)aElement; NS_DELETEXPCOM(state); return PR_TRUE; @@ -1647,7 +1647,7 @@ NS_IMETHODIMP nsWebBrowser::EnsureDocShellTreeOwner() } /* static */ -nsEventStatus PR_CALLBACK nsWebBrowser::HandleEvent(nsGUIEvent *aEvent) +nsEventStatus nsWebBrowser::HandleEvent(nsGUIEvent *aEvent) { nsWebBrowser *browser = nsnull; void *data = nsnull; diff --git a/embedding/browser/webBrowser/nsWebBrowser.h b/embedding/browser/webBrowser/nsWebBrowser.h index 8d519ae5f69b..694eea66ecff 100644 --- a/embedding/browser/webBrowser/nsWebBrowser.h +++ b/embedding/browser/webBrowser/nsWebBrowser.h @@ -151,7 +151,7 @@ protected: NS_IMETHOD UnBindListener(nsISupports *aListener, const nsIID& aIID); NS_IMETHOD EnableGlobalHistory(PRBool aEnable); - static nsEventStatus PR_CALLBACK HandleEvent(nsGUIEvent *aEvent); + static nsEventStatus HandleEvent(nsGUIEvent *aEvent); protected: nsDocShellTreeOwner* mDocShellTreeOwner; diff --git a/embedding/components/commandhandler/src/nsCommandGroup.cpp b/embedding/components/commandhandler/src/nsCommandGroup.cpp index 73667ee9e958..461af2f15395 100644 --- a/embedding/components/commandhandler/src/nsCommandGroup.cpp +++ b/embedding/components/commandhandler/src/nsCommandGroup.cpp @@ -59,7 +59,7 @@ public: protected: - static PRBool PR_CALLBACK HashEnum(nsHashKey *aKey, void *aData, void* aClosure); + static PRBool HashEnum(nsHashKey *aKey, void *aData, void* aClosure); nsresult Initialize(); diff --git a/embedding/components/commandhandler/src/nsCommandGroup.h b/embedding/components/commandhandler/src/nsCommandGroup.h index f10e57f27dbe..0b1dfba7c3a7 100644 --- a/embedding/components/commandhandler/src/nsCommandGroup.h +++ b/embedding/components/commandhandler/src/nsCommandGroup.h @@ -70,7 +70,7 @@ protected: protected: - static PRBool PR_CALLBACK ClearEnumerator(nsHashKey *aKey, void *aData, void* closure); + static PRBool ClearEnumerator(nsHashKey *aKey, void *aData, void* closure); protected: diff --git a/embedding/components/commandhandler/src/nsCommandManager.cpp b/embedding/components/commandhandler/src/nsCommandManager.cpp index 3f6d38d444ba..97a2dd41bb2f 100644 --- a/embedding/components/commandhandler/src/nsCommandManager.cpp +++ b/embedding/components/commandhandler/src/nsCommandManager.cpp @@ -70,7 +70,7 @@ nsCommandManager::~nsCommandManager() } -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator TraverseCommandObservers(const char* aKey, nsCOMArray* aObservers, void* aClosure) { diff --git a/embedding/components/commandhandler/src/nsCommandParams.h b/embedding/components/commandhandler/src/nsCommandParams.h index d34f0fff6f33..be06f7815c5e 100644 --- a/embedding/components/commandhandler/src/nsCommandParams.h +++ b/embedding/components/commandhandler/src/nsCommandParams.h @@ -151,15 +151,15 @@ protected: protected: - static PLDHashNumber PR_CALLBACK HashKey(PLDHashTable *table, const void *key); + static PLDHashNumber HashKey(PLDHashTable *table, const void *key); - static PRBool PR_CALLBACK HashMatchEntry(PLDHashTable *table, - const PLDHashEntryHdr *entry, const void *key); + static PRBool HashMatchEntry(PLDHashTable *table, + const PLDHashEntryHdr *entry, const void *key); - static void PR_CALLBACK HashMoveEntry(PLDHashTable *table, const PLDHashEntryHdr *from, - PLDHashEntryHdr *to); + static void HashMoveEntry(PLDHashTable *table, const PLDHashEntryHdr *from, + PLDHashEntryHdr *to); - static void PR_CALLBACK HashClearEntry(PLDHashTable *table, PLDHashEntryHdr *entry); + static void HashClearEntry(PLDHashTable *table, PLDHashEntryHdr *entry); protected: diff --git a/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.cpp b/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.cpp index 83283114c58d..83990e2b96aa 100644 --- a/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.cpp +++ b/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.cpp @@ -2404,7 +2404,7 @@ nsWebBrowserPersist::FixRedirectedChannelEntry(nsIChannel *aNewChannel) return NS_OK; } -PRBool PR_CALLBACK +PRBool nsWebBrowserPersist::EnumFixRedirect(nsHashKey *aKey, void *aData, void* closure) { FixRedirectData *data = (FixRedirectData *) closure; @@ -2456,7 +2456,7 @@ nsWebBrowserPersist::CalcTotalProgress() } } -PRBool PR_CALLBACK +PRBool nsWebBrowserPersist::EnumCalcProgress(nsHashKey *aKey, void *aData, void* closure) { nsWebBrowserPersist *pthis = (nsWebBrowserPersist *) closure; @@ -2472,7 +2472,7 @@ nsWebBrowserPersist::EnumCalcProgress(nsHashKey *aKey, void *aData, void* closur return PR_TRUE; } -PRBool PR_CALLBACK +PRBool nsWebBrowserPersist::EnumCalcUploadProgress(nsHashKey *aKey, void *aData, void* closure) { if (aData && closure) @@ -2485,7 +2485,7 @@ nsWebBrowserPersist::EnumCalcUploadProgress(nsHashKey *aKey, void *aData, void* return PR_TRUE; } -PRBool PR_CALLBACK +PRBool nsWebBrowserPersist::EnumCountURIsToPersist(nsHashKey *aKey, void *aData, void* closure) { URIData *data = (URIData *) aData; @@ -2497,7 +2497,7 @@ nsWebBrowserPersist::EnumCountURIsToPersist(nsHashKey *aKey, void *aData, void* return PR_TRUE; } -PRBool PR_CALLBACK +PRBool nsWebBrowserPersist::EnumPersistURIs(nsHashKey *aKey, void *aData, void* closure) { URIData *data = (URIData *) aData; @@ -2548,7 +2548,7 @@ nsWebBrowserPersist::EnumPersistURIs(nsHashKey *aKey, void *aData, void* closure return PR_TRUE; } -PRBool PR_CALLBACK +PRBool nsWebBrowserPersist::EnumCleanupOutputMap(nsHashKey *aKey, void *aData, void* closure) { nsCOMPtr keyPtr; @@ -2567,7 +2567,7 @@ nsWebBrowserPersist::EnumCleanupOutputMap(nsHashKey *aKey, void *aData, void* cl } -PRBool PR_CALLBACK +PRBool nsWebBrowserPersist::EnumCleanupURIMap(nsHashKey *aKey, void *aData, void* closure) { URIData *data = (URIData *) aData; @@ -2579,7 +2579,7 @@ nsWebBrowserPersist::EnumCleanupURIMap(nsHashKey *aKey, void *aData, void* closu } -PRBool PR_CALLBACK +PRBool nsWebBrowserPersist::EnumCleanupUploadList(nsHashKey *aKey, void *aData, void* closure) { nsCOMPtr keyPtr; diff --git a/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.h b/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.h index 69407e61bf54..371b6a9b8122 100644 --- a/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.h +++ b/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.h @@ -186,21 +186,21 @@ private: void SetApplyConversionIfNeeded(nsIChannel *aChannel); // Hash table enumerators - static PRBool PR_CALLBACK EnumPersistURIs( + static PRBool EnumPersistURIs( nsHashKey *aKey, void *aData, void* closure); - static PRBool PR_CALLBACK EnumCleanupURIMap( + static PRBool EnumCleanupURIMap( nsHashKey *aKey, void *aData, void* closure); - static PRBool PR_CALLBACK EnumCleanupOutputMap( + static PRBool EnumCleanupOutputMap( nsHashKey *aKey, void *aData, void* closure); - static PRBool PR_CALLBACK EnumCleanupUploadList( + static PRBool EnumCleanupUploadList( nsHashKey *aKey, void *aData, void* closure); - static PRBool PR_CALLBACK EnumCalcProgress( + static PRBool EnumCalcProgress( nsHashKey *aKey, void *aData, void* closure); - static PRBool PR_CALLBACK EnumCalcUploadProgress( + static PRBool EnumCalcUploadProgress( nsHashKey *aKey, void *aData, void* closure); - static PRBool PR_CALLBACK EnumFixRedirect( + static PRBool EnumFixRedirect( nsHashKey *aKey, void *aData, void* closure); - static PRBool PR_CALLBACK EnumCountURIsToPersist( + static PRBool EnumCountURIsToPersist( nsHashKey *aKey, void *aData, void* closure); nsCOMPtr mCurrentDataPath; diff --git a/extensions/access-builtin/accessproxy/nsAccessProxyRegistration.cpp b/extensions/access-builtin/accessproxy/nsAccessProxyRegistration.cpp index df152fec92e6..0825bda02ef7 100644 --- a/extensions/access-builtin/accessproxy/nsAccessProxyRegistration.cpp +++ b/extensions/access-builtin/accessproxy/nsAccessProxyRegistration.cpp @@ -73,7 +73,7 @@ static NS_METHOD nsAccessProxyRegistrationProc(nsIComponentManager *aCompMgr, NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(nsAccessProxy,nsAccessProxy::GetInstance) -static void PR_CALLBACK AccessProxyModuleDtor(nsIModule* self) +static void AccessProxyModuleDtor(nsIModule* self) { nsAccessProxy::ReleaseInstance(); } diff --git a/extensions/auth/nsAuthFactory.cpp b/extensions/auth/nsAuthFactory.cpp index 711f26980fbc..0ffaf3966595 100644 --- a/extensions/auth/nsAuthFactory.cpp +++ b/extensions/auth/nsAuthFactory.cpp @@ -260,7 +260,7 @@ static nsModuleComponentInfo components[] = { PRLogModuleInfo *gNegotiateLog; // setup nspr logging ... -PR_STATIC_CALLBACK(nsresult) +static nsresult InitNegotiateAuth(nsIModule *self) { gNegotiateLog = PR_NewLogModule("negotiateauth"); @@ -270,7 +270,7 @@ InitNegotiateAuth(nsIModule *self) #define InitNegotiateAuth nsnull #endif -PR_STATIC_CALLBACK(void) +static void DestroyNegotiateAuth(nsIModule *self) { nsAuthGSSAPI::Shutdown(); diff --git a/extensions/cookie/nsPermissionManager.cpp b/extensions/cookie/nsPermissionManager.cpp index 7e3830d6379c..8e92fdc95dc4 100644 --- a/extensions/cookie/nsPermissionManager.cpp +++ b/extensions/cookie/nsPermissionManager.cpp @@ -546,7 +546,7 @@ struct nsGetEnumeratorData const nsTArray *types; }; -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator AddPermissionsToList(nsHostEntry *entry, void *arg) { nsGetEnumeratorData *data = static_cast(arg); diff --git a/extensions/metrics/src/nsLoadCollector.cpp b/extensions/metrics/src/nsLoadCollector.cpp index 9b0854038632..11639b1c28eb 100644 --- a/extensions/metrics/src/nsLoadCollector.cpp +++ b/extensions/metrics/src/nsLoadCollector.cpp @@ -450,7 +450,7 @@ nsLoadCollector::OnAttach() return NS_OK; } -/* static */ PLDHashOperator PR_CALLBACK +/* static */ PLDHashOperator nsLoadCollector::RemoveDocumentFromMap(const nsIDocument *document, DocumentEntry &entry, void *userData) { diff --git a/extensions/metrics/src/nsLoadCollector.h b/extensions/metrics/src/nsLoadCollector.h index e617ce5fe857..b4216753078a 100644 --- a/extensions/metrics/src/nsLoadCollector.h +++ b/extensions/metrics/src/nsLoadCollector.h @@ -102,7 +102,7 @@ class nsLoadCollector : public nsIMetricsCollector, ~nsLoadCollector(); // Callback for removing a document observer and map entry - static PLDHashOperator PR_CALLBACK + static PLDHashOperator RemoveDocumentFromMap(const nsIDocument *document, DocumentEntry &entry, void *userData); diff --git a/extensions/metrics/src/nsMetricsConfig.cpp b/extensions/metrics/src/nsMetricsConfig.cpp index 74b46a09aa7b..37080e35cf93 100644 --- a/extensions/metrics/src/nsMetricsConfig.cpp +++ b/extensions/metrics/src/nsMetricsConfig.cpp @@ -414,7 +414,7 @@ nsMetricsConfig::ClearEvents() mEventSet.Clear(); } -/* static */ PLDHashOperator PR_CALLBACK +/* static */ PLDHashOperator nsMetricsConfig::CopyKey(nsStringHashKey *entry, void *userData) { static_cast *>(userData)-> diff --git a/extensions/metrics/src/nsMetricsConfig.h b/extensions/metrics/src/nsMetricsConfig.h index 251e4e0b11d6..aee08a785a39 100644 --- a/extensions/metrics/src/nsMetricsConfig.h +++ b/extensions/metrics/src/nsMetricsConfig.h @@ -152,8 +152,7 @@ private: void ProcessConfigChild(nsIDOMElement *elem); void ProcessCollectorElement(nsIDOMElement *elem); - static PLDHashOperator PR_CALLBACK CopyKey(nsStringHashKey *key, - void *userData); + static PLDHashOperator CopyKey(nsStringHashKey *key, void *userData); nsTHashtable mEventSet; nsDataHashtable mNSURIToPrefixMap; diff --git a/extensions/metrics/src/nsMetricsService.cpp b/extensions/metrics/src/nsMetricsService.cpp index d19f422a701e..b7a5dc7b3a7b 100644 --- a/extensions/metrics/src/nsMetricsService.cpp +++ b/extensions/metrics/src/nsMetricsService.cpp @@ -204,7 +204,7 @@ nsMetricsService::nsMetricsService() sMetricsService = this; } -/* static */ PLDHashOperator PR_CALLBACK +/* static */ PLDHashOperator nsMetricsService::DetachCollector(const nsAString &key, nsIMetricsCollector *value, void *userData) { @@ -773,7 +773,7 @@ struct DisabledCollectorsClosure nsTArray< nsCOMPtr > disabledCollectors; }; -/* static */ PLDHashOperator PR_CALLBACK +/* static */ PLDHashOperator nsMetricsService::PruneDisabledCollectors(const nsAString &key, nsCOMPtr &value, void *userData) @@ -797,7 +797,7 @@ nsMetricsService::PruneDisabledCollectors(const nsAString &key, return PL_DHASH_REMOVE; } -/* static */ PLDHashOperator PR_CALLBACK +/* static */ PLDHashOperator nsMetricsService::NotifyNewLog(const nsAString &key, nsIMetricsCollector *value, void *userData) { diff --git a/extensions/metrics/src/nsMetricsService.h b/extensions/metrics/src/nsMetricsService.h index ca6c2bce1b9a..a9bf6399df99 100644 --- a/extensions/metrics/src/nsMetricsService.h +++ b/extensions/metrics/src/nsMetricsService.h @@ -220,16 +220,16 @@ private: // Generates a random interval, in seconds, between 12 and 36 hours. PRInt32 GetRandomUploadInterval(); - static PLDHashOperator PR_CALLBACK + static PLDHashOperator PruneDisabledCollectors(const nsAString &key, nsCOMPtr &value, void *userData); - static PLDHashOperator PR_CALLBACK + static PLDHashOperator DetachCollector(const nsAString &key, nsIMetricsCollector *value, void *userData); - static PLDHashOperator PR_CALLBACK + static PLDHashOperator NotifyNewLog(const nsAString &key, nsIMetricsCollector *value, void *userData); diff --git a/extensions/metrics/src/nsUICommandCollector.cpp b/extensions/metrics/src/nsUICommandCollector.cpp index af86bef3b576..2c3faa6caad8 100644 --- a/extensions/metrics/src/nsUICommandCollector.cpp +++ b/extensions/metrics/src/nsUICommandCollector.cpp @@ -60,7 +60,7 @@ NS_IMPL_ISUPPORTS3(nsUICommandCollector, nsIObserver, nsIDOMEventListener, nsIMetricsCollector) /* static */ -PLDHashOperator PR_CALLBACK nsUICommandCollector::AddCommandEventListener( +PLDHashOperator nsUICommandCollector::AddCommandEventListener( const nsIDOMWindow* key, PRUint32 windowID, void* userArg) { nsCOMPtr windowTarget = @@ -77,7 +77,7 @@ const nsIDOMWindow* key, PRUint32 windowID, void* userArg) } /* static */ -PLDHashOperator PR_CALLBACK nsUICommandCollector::RemoveCommandEventListener( +PLDHashOperator nsUICommandCollector::RemoveCommandEventListener( const nsIDOMWindow* key, PRUint32 windowID, void* userArg) { nsCOMPtr windowTarget = diff --git a/extensions/metrics/src/nsUICommandCollector.h b/extensions/metrics/src/nsUICommandCollector.h index 0f453c8ae9bb..ad621e5f55f5 100644 --- a/extensions/metrics/src/nsUICommandCollector.h +++ b/extensions/metrics/src/nsUICommandCollector.h @@ -60,10 +60,10 @@ class nsUICommandCollector : public nsIObserver, NS_DECL_NSIDOMEVENTLISTENER NS_DECL_NSIMETRICSCOLLECTOR - static PLDHashOperator PR_CALLBACK AddCommandEventListener( + static PLDHashOperator AddCommandEventListener( const nsIDOMWindow* key, PRUint32 windowID, void* userArg); - static PLDHashOperator PR_CALLBACK RemoveCommandEventListener( + static PLDHashOperator RemoveCommandEventListener( const nsIDOMWindow* key, PRUint32 windowID, void* userArg); nsUICommandCollector(); diff --git a/extensions/pref/system-pref/src/gconf/nsSystemPrefService.cpp b/extensions/pref/system-pref/src/gconf/nsSystemPrefService.cpp index 67af7d254753..648c6d8f0076 100644 --- a/extensions/pref/system-pref/src/gconf/nsSystemPrefService.cpp +++ b/extensions/pref/system-pref/src/gconf/nsSystemPrefService.cpp @@ -209,7 +209,7 @@ struct SysPrefCallbackData { PRUint32 prefAtom; }; -PRBool PR_CALLBACK +PRBool sysPrefDeleteObserver(void *aElement, void *aData) { SysPrefCallbackData *pElement = static_cast(aElement); @@ -586,7 +586,7 @@ static const PrefNamePair sPrefNameMapping[] = { {nsnull, nsnull}, }; -PRBool PR_CALLBACK +PRBool gconfDeleteObserver(void *aElement, void *aData) { nsMemory::Free(aElement); return PR_TRUE; diff --git a/extensions/spellcheck/src/mozPersonalDictionary.cpp b/extensions/spellcheck/src/mozPersonalDictionary.cpp index e4c907ceefa2..cb7c18de2117 100644 --- a/extensions/spellcheck/src/mozPersonalDictionary.cpp +++ b/extensions/spellcheck/src/mozPersonalDictionary.cpp @@ -155,7 +155,7 @@ NS_IMETHODIMP mozPersonalDictionary::Load() // A little helper function to add the key to the list. // This is not threadsafe, and only safe if the consumer does not // modify the list. -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator AddHostToStringArray(nsUniCharEntry *aEntry, void *aArg) { static_cast(aArg)->AppendString(nsDependentString(aEntry->GetKey())); diff --git a/gfx/src/nsDeviceContext.cpp b/gfx/src/nsDeviceContext.cpp index b66b6de504d0..0885d3e5472c 100644 --- a/gfx/src/nsDeviceContext.cpp +++ b/gfx/src/nsDeviceContext.cpp @@ -70,7 +70,7 @@ DeviceContextImpl::DeviceContextImpl() #endif } -static PRBool PR_CALLBACK DeleteValue(nsHashKey* aKey, void* aValue, void* closure) +static PRBool DeleteValue(nsHashKey* aKey, void* aValue, void* closure) { delete ((nsString*)aValue); return PR_TRUE; diff --git a/gfx/src/thebes/nsThebesGfxFactory.cpp b/gfx/src/thebes/nsThebesGfxFactory.cpp index 4ad22577b720..4d2b1eb5960d 100644 --- a/gfx/src/thebes/nsThebesGfxFactory.cpp +++ b/gfx/src/thebes/nsThebesGfxFactory.cpp @@ -137,13 +137,13 @@ static const nsModuleComponentInfo components[] = gfxImageFrameConstructor }, }; -PR_STATIC_CALLBACK(nsresult) +static nsresult nsThebesGfxModuleCtor(nsIModule *self) { return gfxPlatform::Init(); } -PR_STATIC_CALLBACK(void) +static void nsThebesGfxModuleDtor(nsIModule *self) { nsThebesDeviceContext::Shutdown(); diff --git a/gfx/tests/coverage/nsCoverage.cpp b/gfx/tests/coverage/nsCoverage.cpp index 9bfd02dafb3f..9c05936b7b3a 100644 --- a/gfx/tests/coverage/nsCoverage.cpp +++ b/gfx/tests/coverage/nsCoverage.cpp @@ -252,7 +252,7 @@ nsPoint *pointlist; * Main Handler *-------------------------------------------------------------------------------- */ -nsEventStatus PR_CALLBACK HandleEvent(nsGUIEvent *aEvent) +nsEventStatus HandleEvent(nsGUIEvent *aEvent) { nsEventStatus result = nsEventStatus_eIgnore; diff --git a/gfx/thebes/public/gfxWindowsPlatform.h b/gfx/thebes/public/gfxWindowsPlatform.h index 2e79a0dd17a5..c5a3c8f55cff 100644 --- a/gfx/thebes/public/gfxWindowsPlatform.h +++ b/gfx/thebes/public/gfxWindowsPlatform.h @@ -123,29 +123,29 @@ private: const NEWTEXTMETRICEXW *nmetrics, DWORD fontType, LPARAM data); - static PLDHashOperator PR_CALLBACK FontGetStylesProc(nsStringHashKey::KeyType aKey, - nsRefPtr& aFontFamily, - void* userArg); + static PLDHashOperator FontGetStylesProc(nsStringHashKey::KeyType aKey, + nsRefPtr& aFontFamily, + void* userArg); - static PLDHashOperator PR_CALLBACK FontGetCMapDataProc(nsStringHashKey::KeyType aKey, - nsRefPtr& aFontFamily, - void* userArg); + static PLDHashOperator FontGetCMapDataProc(nsStringHashKey::KeyType aKey, + nsRefPtr& aFontFamily, + void* userArg); static int CALLBACK FontResolveProc(const ENUMLOGFONTEXW *lpelfe, const NEWTEXTMETRICEXW *metrics, DWORD fontType, LPARAM data); - static PLDHashOperator PR_CALLBACK HashEnumFunc(nsStringHashKey::KeyType aKey, - nsRefPtr& aData, - void* userArg); + static PLDHashOperator HashEnumFunc(nsStringHashKey::KeyType aKey, + nsRefPtr& aData, + void* userArg); - static PLDHashOperator PR_CALLBACK FindFontForCharProc(nsStringHashKey::KeyType aKey, - nsRefPtr& aFontFamily, - void* userArg); + static PLDHashOperator FindFontForCharProc(nsStringHashKey::KeyType aKey, + nsRefPtr& aFontFamily, + void* userArg); virtual cmsHPROFILE GetPlatformCMSOutputProfile(); - static int PR_CALLBACK PrefChangedCallback(const char*, void*); + static int PrefChangedCallback(const char*, void*); // gfxFontInfoLoader overrides, used to load in font cmaps virtual void InitLoader(); diff --git a/gfx/thebes/src/gfxQuartzFontCache.h b/gfx/thebes/src/gfxQuartzFontCache.h index 22a043188297..8bde55607861 100644 --- a/gfx/thebes/src/gfxQuartzFontCache.h +++ b/gfx/thebes/src/gfxQuartzFontCache.h @@ -230,9 +230,9 @@ public: gfxFontEntry* MakePlatformFont(const gfxFontEntry *aProxyEntry, const gfxDownloadedFontData* aFontData); private: - static PLDHashOperator PR_CALLBACK FindFontForCharProc(nsStringHashKey::KeyType aKey, - nsRefPtr& aFamilyEntry, - void* userArg); + static PLDHashOperator FindFontForCharProc(nsStringHashKey::KeyType aKey, + nsRefPtr& aFamilyEntry, + void* userArg); static gfxQuartzFontCache *sSharedFontCache; @@ -260,15 +260,15 @@ private: // explicitly set font traits for all faces to fixed-pitch void SetFixedPitch(const nsAString& aFamilyName); - static PLDHashOperator PR_CALLBACK InitOtherFamilyNamesProc(nsStringHashKey::KeyType aKey, - nsRefPtr& aFamilyEntry, - void* userArg); + static PLDHashOperator InitOtherFamilyNamesProc(nsStringHashKey::KeyType aKey, + nsRefPtr& aFamilyEntry, + void* userArg); void GenerateFontListKey(const nsAString& aKeyName, nsAString& aResult); static void ATSNotification(ATSFontNotificationInfoRef aInfo, void* aUserArg); - static int PR_CALLBACK PrefChangedCallback(const char *aPrefName, void *closure); + static int PrefChangedCallback(const char *aPrefName, void *closure); - static PLDHashOperator PR_CALLBACK + static PLDHashOperator HashEnumFuncForFamilies(nsStringHashKey::KeyType aKey, nsRefPtr& aFamilyEntry, void* aUserArg); diff --git a/gfx/thebes/src/gfxTextRunWordCache.cpp b/gfx/thebes/src/gfxTextRunWordCache.cpp index f9bb8efc913e..2b3edb0f6abd 100644 --- a/gfx/thebes/src/gfxTextRunWordCache.cpp +++ b/gfx/thebes/src/gfxTextRunWordCache.cpp @@ -185,7 +185,7 @@ protected: nsTHashtable mCache; #ifdef DEBUG - static PLDHashOperator PR_CALLBACK CacheDumpEntry(CacheHashEntry* aEntry, void* userArg); + static PLDHashOperator CacheDumpEntry(CacheHashEntry* aEntry, void* userArg); #endif }; @@ -767,7 +767,7 @@ TextRunWordCache::CacheHashEntry::HashKey(const KeyTypePointer aKey) } #ifdef DEBUG -PLDHashOperator PR_CALLBACK +PLDHashOperator TextRunWordCache::CacheDumpEntry(CacheHashEntry* aEntry, void* userArg) { FILE* output = static_cast(userArg); diff --git a/gfx/thebes/src/gfxWindowsPlatform.cpp b/gfx/thebes/src/gfxWindowsPlatform.cpp index 554b298dfeee..3158fd3a76c3 100644 --- a/gfx/thebes/src/gfxWindowsPlatform.cpp +++ b/gfx/thebes/src/gfxWindowsPlatform.cpp @@ -75,7 +75,7 @@ BuildKeyNameFromFontName(nsAString &aName) ToLowerCase(aName); } -int PR_CALLBACK +int gfxWindowsPlatform::PrefChangedCallback(const char *aPrefName, void *closure) { // XXX this could be made to only clear out the cache for the prefs that were changed @@ -154,7 +154,7 @@ struct FontListData { nsStringArray& mStringArray; }; -PLDHashOperator PR_CALLBACK +PLDHashOperator gfxWindowsPlatform::HashEnumFunc(nsStringHashKey::KeyType aKey, nsRefPtr& aFontFamily, void* userArg) @@ -284,9 +284,9 @@ struct FontFamilyListData { : mFamilyArray(aFamilyArray) {} - static PLDHashOperator PR_CALLBACK AppendFamily(nsStringHashKey::KeyType aKey, - nsRefPtr& aFamilyEntry, - void *aUserArg) + static PLDHashOperator AppendFamily(nsStringHashKey::KeyType aKey, + nsRefPtr& aFamilyEntry, + void *aUserArg) { FontFamilyListData *data = (FontFamilyListData*)aUserArg; data->mFamilyArray.AppendElement(aFamilyEntry); @@ -443,7 +443,7 @@ struct FontSearch { nsRefPtr bestMatch; }; -PLDHashOperator PR_CALLBACK +PLDHashOperator gfxWindowsPlatform::FindFontForCharProc(nsStringHashKey::KeyType aKey, nsRefPtr& aFontFamily, void* userArg) diff --git a/intl/locale/src/nsLocale.h b/intl/locale/src/nsLocale.h index 640db555f26f..32619300d753 100644 --- a/intl/locale/src/nsLocale.h +++ b/intl/locale/src/nsLocale.h @@ -75,10 +75,10 @@ protected: NS_IMETHOD AddCategory(const nsAString& category, const nsAString& value); - static PLHashNumber PR_CALLBACK Hash_HashFunction(const void* key); - static PRIntn PR_CALLBACK Hash_CompareNSString(const void* s1, const void* s2); - static PRIntn PR_CALLBACK Hash_EnumerateDelete(PLHashEntry *he, PRIntn hashIndex, void *arg); - static PRIntn PR_CALLBACK Hash_EnumerateCopy(PLHashEntry *he, PRIntn hashIndex, void *arg); + static PLHashNumber Hash_HashFunction(const void* key); + static PRIntn Hash_CompareNSString(const void* s1, const void* s2); + static PRIntn Hash_EnumerateDelete(PLHashEntry *he, PRIntn hashIndex, void *arg); + static PRIntn Hash_EnumerateCopy(PLHashEntry *he, PRIntn hashIndex, void *arg); PLHashTable* fHashtable; PRUint32 fCategoryCount; diff --git a/ipc/ipcd/client/src/ipcConnectionUnix.cpp b/ipc/ipcd/client/src/ipcConnectionUnix.cpp index 1b9985e83a40..f45fd6e42078 100644 --- a/ipc/ipcd/client/src/ipcConnectionUnix.cpp +++ b/ipc/ipcd/client/src/ipcConnectionUnix.cpp @@ -300,7 +300,7 @@ ConnWrite(ipcConnectionState *s) return rv; } -PR_STATIC_CALLBACK(void) +static void ConnThread(void *arg) { PRInt32 num; diff --git a/ipc/ipcd/client/src/ipcModuleFactory.cpp b/ipc/ipcd/client/src/ipcModuleFactory.cpp index 7dcd6eab5959..a94e7b50cdd0 100644 --- a/ipc/ipcd/client/src/ipcModuleFactory.cpp +++ b/ipc/ipcd/client/src/ipcModuleFactory.cpp @@ -175,13 +175,13 @@ static const nsModuleComponentInfo components[] = { //----------------------------------------------------------------------------- -PR_STATIC_CALLBACK(nsresult) +static nsresult ipcdclient_init(nsIModule *module) { return IPC_Init(); } -PR_STATIC_CALLBACK(void) +static void ipcdclient_shutdown(nsIModule *module) { IPC_Shutdown(); diff --git a/ipc/ipcd/client/src/ipcdclient.cpp b/ipc/ipcd/client/src/ipcdclient.cpp index dea8357f8bf0..0d6657ad6003 100644 --- a/ipc/ipcd/client/src/ipcdclient.cpp +++ b/ipc/ipcd/client/src/ipcdclient.cpp @@ -986,7 +986,7 @@ end: /* ------------------------------------------------------------------------- */ -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator EnumerateTargetMapAndNotify(const nsID &aKey, ipcTargetData *aData, void *aClosure) diff --git a/ipc/ipcd/extensions/dconnect/src/ipcDConnectService.cpp b/ipc/ipcd/extensions/dconnect/src/ipcDConnectService.cpp index f6efec455ac2..3b49aadf8f04 100644 --- a/ipc/ipcd/extensions/dconnect/src/ipcDConnectService.cpp +++ b/ipc/ipcd/extensions/dconnect/src/ipcDConnectService.cpp @@ -1330,7 +1330,7 @@ SetupPeerInstance(PRUint32 aPeerID, DConnectSetup *aMsg, PRUint32 aMsgLen, //----------------------------------------------------------------------------- -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator DestroyDConnectInstance(const void *key, DConnectInstance *wrapper, void *userArg) diff --git a/ipc/ipcd/extensions/lock/src/module/ipcLockModule.cpp b/ipc/ipcd/extensions/lock/src/module/ipcLockModule.cpp index 151c0f89586a..073dbed7e378 100644 --- a/ipc/ipcd/extensions/lock/src/module/ipcLockModule.cpp +++ b/ipc/ipcd/extensions/lock/src/module/ipcLockModule.cpp @@ -84,25 +84,25 @@ struct ipcLockContext //----------------------------------------------------------------------------- -PR_STATIC_CALLBACK(void *) +static void * ipcLockModule_AllocTable(void *pool, PRSize size) { return malloc(size); } -PR_STATIC_CALLBACK(void) +static void ipcLockModule_FreeTable(void *pool, void *item) { free(item); } -PR_STATIC_CALLBACK(PLHashEntry *) +static PLHashEntry * ipcLockModule_AllocEntry(void *pool, const void *key) { return (PLHashEntry *) malloc(sizeof(PLHashEntry)); } -PR_STATIC_CALLBACK(void) +static void ipcLockModule_FreeEntry(void *pool, PLHashEntry *he, PRUintn flag) { PL_strfree((char *) he->key); @@ -226,7 +226,7 @@ ipcLockModule_ReleaseLock(PRUint32 cid, const char *key) PL_HashTableRemove(gLockTable, key); } -PR_STATIC_CALLBACK(PRIntn) +static PRIntn ipcLockModule_ReleaseByCID(PLHashEntry *he, PRIntn i, void *arg) { PRUint32 cid = *(PRUint32 *) arg; diff --git a/ipc/ipcd/extensions/lock/test/TestIPCLocks.cpp b/ipc/ipcd/extensions/lock/test/TestIPCLocks.cpp index b723e43645ba..0bedf49bdd83 100644 --- a/ipc/ipcd/extensions/lock/test/TestIPCLocks.cpp +++ b/ipc/ipcd/extensions/lock/test/TestIPCLocks.cpp @@ -99,7 +99,7 @@ static void RandomSleep(PRUint32 fromMS, PRUint32 toMS) static ipcILockService *gLockService; -PR_STATIC_CALLBACK(void) TestThread(void *arg) +static void TestThread(void *arg) { const char *lockName = (const char *) arg; diff --git a/jpeg/jmorecfg.h b/jpeg/jmorecfg.h index 82ae712b4293..de6d39318400 100644 --- a/jpeg/jmorecfg.h +++ b/jpeg/jmorecfg.h @@ -216,7 +216,7 @@ typedef unsigned int JDIMENSION; #include "prtypes.h" /* a function called through method pointers: */ -#define METHODDEF(type) static type PR_CALLBACK +#define METHODDEF(type) static type /* a function used only in its module: */ #define LOCAL(type) static type diff --git a/js/jsd/jsd_java.c b/js/jsd/jsd_java.c index b000d581f53e..03f7f6d71d39 100644 --- a/js/jsd/jsd_java.c +++ b/js/jsd/jsd_java.c @@ -139,7 +139,7 @@ _scriptObFromJSDScriptPtr( ExecEnv* ee, JSDScript* jsdscript ) /***************************************************************************/ -void PR_CALLBACK +void _scriptHook( JSDContext* jsdc, JSDScript* jsdscript, JSBool creating, @@ -221,7 +221,7 @@ _scriptHook( JSDContext* jsdc, } /***************************************************************************/ -PRUintn PR_CALLBACK +PRUintn _executionHook( JSDContext* jsdc, JSDThreadState* jsdstate, PRUintn type, @@ -340,7 +340,7 @@ _executionHook( JSDContext* jsdc, return JSD_HOOK_RETURN_CONTINUE; } -PRUintn PR_CALLBACK +PRUintn _errorReporter( JSDContext* jsdc, JSContext* cx, const char* message, diff --git a/js/src/prmjtime.cpp b/js/src/prmjtime.cpp index a028a588800a..881dd70e53f5 100644 --- a/js/src/prmjtime.cpp +++ b/js/src/prmjtime.cpp @@ -229,7 +229,7 @@ NowCalibrate() #define LASTLOCK_SPINCOUNT 4096 #ifdef JS_THREADSAFE -static PRStatus PR_CALLBACK +static PRStatus NowInit(void) { memset(&calibration, 0, sizeof(calibration)); diff --git a/js/src/xpconnect/src/xpcjsruntime.cpp b/js/src/xpconnect/src/xpcjsruntime.cpp index 594e5791937f..e312b1eedf52 100644 --- a/js/src/xpconnect/src/xpcjsruntime.cpp +++ b/js/src/xpconnect/src/xpcjsruntime.cpp @@ -328,7 +328,7 @@ void XPCJSRuntime::TraceJS(JSTracer* trc, void* data) } } -PR_STATIC_CALLBACK(void) +static void TraceJSObject(PRUint32 aLangID, void *aScriptThing, void *aClosure) { if(aLangID == nsIProgrammingLanguage::JAVASCRIPT) diff --git a/js/src/xpconnect/src/xpcmodule.cpp b/js/src/xpconnect/src/xpcmodule.cpp index dcebc10cbc75..4cb2c547299f 100644 --- a/js/src/xpconnect/src/xpcmodule.cpp +++ b/js/src/xpconnect/src/xpcmodule.cpp @@ -108,7 +108,7 @@ static const nsModuleComponentInfo components[] = { #endif }; -PR_STATIC_CALLBACK(nsresult) +static nsresult xpcModuleCtor(nsIModule* self) { nsXPConnect::InitStatics(); @@ -125,7 +125,7 @@ xpcModuleCtor(nsIModule* self) return NS_OK; } -PR_STATIC_CALLBACK(void) +static void xpcModuleDtor(nsIModule* self) { // Release our singletons diff --git a/js/src/xpconnect/src/xpcthreadcontext.cpp b/js/src/xpconnect/src/xpcthreadcontext.cpp index a457b26820d9..2b230cea4f4d 100644 --- a/js/src/xpconnect/src/xpcthreadcontext.cpp +++ b/js/src/xpconnect/src/xpcthreadcontext.cpp @@ -534,7 +534,7 @@ XPCPerThreadData::~XPCPerThreadData() } } -PR_STATIC_CALLBACK(void) +static void xpc_ThreadDataDtorCB(void* ptr) { XPCPerThreadData* data = (XPCPerThreadData*) ptr; diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp index 0384ae6665ca..04eb53e6fdd7 100644 --- a/layout/base/nsCSSFrameConstructor.cpp +++ b/layout/base/nsCSSFrameConstructor.cpp @@ -13199,7 +13199,7 @@ nsCSSFrameConstructor::RestyleForRemove(nsIContent* aContainer, } -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator CollectRestyles(nsISupports* aContent, nsCSSFrameConstructor::RestyleData& aData, void* aRestyleArrayPtr) diff --git a/layout/base/nsCSSFrameConstructor.h b/layout/base/nsCSSFrameConstructor.h index fa56319b6835..edb7b9b75c94 100644 --- a/layout/base/nsCSSFrameConstructor.h +++ b/layout/base/nsCSSFrameConstructor.h @@ -75,7 +75,7 @@ struct nsFindFrameHint nsFindFrameHint() : mPrimaryFrameForPrevSibling(nsnull) { } }; -typedef void (PR_CALLBACK nsLazyFrameConstructionCallback) +typedef void (nsLazyFrameConstructionCallback) (nsIContent* aContent, nsIFrame* aFrame, void* aArg); class nsFrameConstructorState; diff --git a/layout/base/nsCounterManager.cpp b/layout/base/nsCounterManager.cpp index 4b863d13ab3d..c7ec99fcc8a0 100644 --- a/layout/base/nsCounterManager.cpp +++ b/layout/base/nsCounterManager.cpp @@ -285,7 +285,7 @@ nsCounterManager::CounterListFor(const nsSubstring& aCounterName) return counterList; } -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator RecalcDirtyLists(const nsAString& aKey, nsCounterList* aList, void* aClosure) { if (aList->IsDirty()) @@ -310,7 +310,7 @@ struct DestroyNodesData { PRBool mDestroyedAny; }; -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator DestroyNodesInList(const nsAString& aKey, nsCounterList* aList, void* aClosure) { DestroyNodesData *data = static_cast(aClosure); @@ -330,7 +330,7 @@ nsCounterManager::DestroyNodesFor(nsIFrame *aFrame) } #ifdef DEBUG -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator DumpList(const nsAString& aKey, nsCounterList* aList, void* aClosure) { printf("Counter named \"%s\":\n", NS_ConvertUTF16toUTF8(aKey).get()); diff --git a/layout/base/nsDocumentViewer.cpp b/layout/base/nsDocumentViewer.cpp index 620e91bb3bec..438e985a93ea 100644 --- a/layout/base/nsDocumentViewer.cpp +++ b/layout/base/nsDocumentViewer.cpp @@ -2067,7 +2067,7 @@ DocumentViewerImpl::RequestWindowClose(PRBool* aCanClose) return NS_OK; } -PR_STATIC_CALLBACK(PRBool) +static PRBool AppendAgentSheet(nsIStyleSheet *aSheet, void *aData) { nsStyleSet *styleSet = static_cast(aData); @@ -2075,7 +2075,7 @@ AppendAgentSheet(nsIStyleSheet *aSheet, void *aData) return PR_TRUE; } -PR_STATIC_CALLBACK(PRBool) +static PRBool PrependUserSheet(nsIStyleSheet *aSheet, void *aData) { nsStyleSet *styleSet = static_cast(aData); diff --git a/layout/base/nsFrameManager.cpp b/layout/base/nsFrameManager.cpp index e2d9f37a07d1..79f16e1887b3 100644 --- a/layout/base/nsFrameManager.cpp +++ b/layout/base/nsFrameManager.cpp @@ -126,7 +126,7 @@ struct PlaceholderMapEntry : public PLDHashEntryHdr { nsPlaceholderFrame *placeholderFrame; }; -PR_STATIC_CALLBACK(PRBool) +static PRBool PlaceholderMapMatchEntry(PLDHashTable *table, const PLDHashEntryHdr *hdr, const void *key) { @@ -163,7 +163,7 @@ struct PrimaryFrameMapEntry : public PLDHashEntryHdr { // These ops should be used if/when we switch back to a 2-word entry. // See comment in |PrimaryFrameMapEntry| above. #if 0 -PR_STATIC_CALLBACK(PRBool) +static PRBool PrimaryFrameMapMatchEntry(PLDHashTable *table, const PLDHashEntryHdr *hdr, const void *key) { @@ -521,7 +521,7 @@ nsFrameManager::UnregisterPlaceholderFrame(nsPlaceholderFrame* aPlaceholderFrame } } -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator UnregisterPlaceholders(PLDHashTable* table, PLDHashEntryHdr* hdr, PRUint32 number, void* arg) { @@ -1828,7 +1828,7 @@ nsFrameManagerBase::UndisplayedMap::RemoveNodesFor(nsIContent* aParentContent) } } -PR_STATIC_CALLBACK(PRIntn) +static PRIntn RemoveUndisplayedEntry(PLHashEntry* he, PRIntn i, void* arg) { UndisplayedNode* node = (UndisplayedNode*)(he->value); diff --git a/layout/base/nsIFocusEventSuppressor.h b/layout/base/nsIFocusEventSuppressor.h index 079fa6f7afcd..42251c296dbe 100644 --- a/layout/base/nsIFocusEventSuppressor.h +++ b/layout/base/nsIFocusEventSuppressor.h @@ -39,7 +39,7 @@ #define nsIFocusEventSuppressor_h___ #include "nsISupports.h" -typedef void (*PR_CALLBACK nsFocusEventSuppressorCallback)(PRBool aSuppress); +typedef void (* nsFocusEventSuppressorCallback)(PRBool aSuppress); #define NS_NSIFOCUSEVENTSUPPRESSORSERVICE_IID \ { 0x8aae5cee, 0x59ab, 0x42d4, \ diff --git a/layout/base/nsPresContext.cpp b/layout/base/nsPresContext.cpp index 34e268eac77d..b9da0b5d984e 100644 --- a/layout/base/nsPresContext.cpp +++ b/layout/base/nsPresContext.cpp @@ -111,7 +111,7 @@ MakeColorPref(const char *colstr) return colorref; } -int PR_CALLBACK +int nsPresContext::PrefChangedCallback(const char* aPrefName, void* instance_data) { nsPresContext* presContext = (nsPresContext*)instance_data; @@ -149,7 +149,7 @@ IsVisualCharset(const nsCString& aCharset) #endif // IBMBIDI -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator destroy_loads(const void * aKey, nsCOMPtr& aData, void* closure) { aData->Destroy(); @@ -298,7 +298,7 @@ NS_INTERFACE_MAP_END NS_IMPL_CYCLE_COLLECTING_ADDREF(nsPresContext) NS_IMPL_CYCLE_COLLECTING_RELEASE(nsPresContext) -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator TraverseImageLoader(const void * aKey, nsCOMPtr& aData, void* aClosure) { @@ -1027,7 +1027,7 @@ static void SetImgAnimModeOnImgReq(imgIRequest* aImgReq, PRUint16 aMode) } // Enumeration call back for HashTable -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator set_animation_mode(const void * aKey, nsCOMPtr& aData, void* closure) { imgIRequest* imgReq = aData->GetRequest(); diff --git a/layout/base/nsPresContext.h b/layout/base/nsPresContext.h index 816b260dbb84..c6ffea6db079 100644 --- a/layout/base/nsPresContext.h +++ b/layout/base/nsPresContext.h @@ -757,10 +757,10 @@ protected: NS_HIDDEN_(void) GetDocumentColorPreferences(); NS_HIDDEN_(void) PreferenceChanged(const char* aPrefName); - static NS_HIDDEN_(int) PR_CALLBACK PrefChangedCallback(const char*, void*); + static NS_HIDDEN_(int) PrefChangedCallback(const char*, void*); NS_HIDDEN_(void) UpdateAfterPreferencesChanged(); - static NS_HIDDEN_(void) PR_CALLBACK PrefChangedUpdateTimerCallback(nsITimer *aTimer, void *aClosure); + static NS_HIDDEN_(void) PrefChangedUpdateTimerCallback(nsITimer *aTimer, void *aClosure); NS_HIDDEN_(void) GetUserPreferences(); NS_HIDDEN_(void) GetFontPreferences(); diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp index db14ef0f9454..824e2afcd68c 100644 --- a/layout/base/nsPresShell.cpp +++ b/layout/base/nsPresShell.cpp @@ -375,26 +375,26 @@ protected: void DisplayTotals(PRUint32 aTotal, PRUint32 * aDupArray, char * aTitle); void DisplayHTMLTotals(PRUint32 aTotal, PRUint32 * aDupArray, char * aTitle); - PR_STATIC_CALLBACK(PRIntn) RemoveItems(PLHashEntry *he, PRIntn i, void *arg); - PR_STATIC_CALLBACK(PRIntn) RemoveIndiItems(PLHashEntry *he, PRIntn i, void *arg); + static PRIntn RemoveItems(PLHashEntry *he, PRIntn i, void *arg); + static PRIntn RemoveIndiItems(PLHashEntry *he, PRIntn i, void *arg); void CleanUp(); // stdout Output Methods - PR_STATIC_CALLBACK(PRIntn) DoSingleTotal(PLHashEntry *he, PRIntn i, void *arg); - PR_STATIC_CALLBACK(PRIntn) DoSingleIndi(PLHashEntry *he, PRIntn i, void *arg); + static PRIntn DoSingleTotal(PLHashEntry *he, PRIntn i, void *arg); + static PRIntn DoSingleIndi(PLHashEntry *he, PRIntn i, void *arg); void DoGrandTotals(); void DoIndiTotalsTree(); // HTML Output Methods - PR_STATIC_CALLBACK(PRIntn) DoSingleHTMLTotal(PLHashEntry *he, PRIntn i, void *arg); + static PRIntn DoSingleHTMLTotal(PLHashEntry *he, PRIntn i, void *arg); void DoGrandHTMLTotals(); // Zero Out the Totals - PR_STATIC_CALLBACK(PRIntn) DoClearTotals(PLHashEntry *he, PRIntn i, void *arg); + static PRIntn DoClearTotals(PLHashEntry *he, PRIntn i, void *arg); // Displays the Diff Totals - PR_STATIC_CALLBACK(PRIntn) DoDisplayDiffTotals(PLHashEntry *he, PRIntn i, void *arg); + static PRIntn DoDisplayDiffTotals(PLHashEntry *he, PRIntn i, void *arg); PLHashTable * mCounts; PLHashTable * mIndiFrameCounts; @@ -6069,7 +6069,7 @@ StopVideoInstance(PresShell *aShell, nsIContent *aContent) #endif } -PR_STATIC_CALLBACK(PRBool) +static PRBool FreezeSubDocument(nsIDocument *aDocument, void *aData) { nsIPresShell *shell = aDocument->GetPrimaryShell(); @@ -6124,7 +6124,7 @@ StartVideoInstance(PresShell *aShell, nsIContent *aContent) #endif } -PR_STATIC_CALLBACK(PRBool) +static PRBool ThawSubDocument(nsIDocument *aDocument, void *aData) { nsIPresShell *shell = aDocument->GetPrimaryShell(); @@ -6483,9 +6483,9 @@ PresShell::ClearReflowEventStatus() */ // Return value says whether to walk children. -typedef PRBool (* PR_CALLBACK frameWalkerFn)(nsIFrame *aFrame, void *aClosure); +typedef PRBool (* frameWalkerFn)(nsIFrame *aFrame, void *aClosure); -PR_STATIC_CALLBACK(PRBool) +static PRBool ReResolveMenusAndTrees(nsIFrame *aFrame, void *aClosure) { // Trees have a special style cache that needs to be flushed when @@ -6503,7 +6503,7 @@ ReResolveMenusAndTrees(nsIFrame *aFrame, void *aClosure) return PR_TRUE; } -PR_STATIC_CALLBACK(PRBool) +static PRBool ReframeImageBoxes(nsIFrame *aFrame, void *aClosure) { nsStyleChangeList *list = static_cast(aClosure); diff --git a/layout/build/nsLayoutModule.cpp b/layout/build/nsLayoutModule.cpp index fd064bf72a37..a26c889f8ccd 100644 --- a/layout/build/nsLayoutModule.cpp +++ b/layout/build/nsLayoutModule.cpp @@ -258,7 +258,7 @@ NS_IMETHODIMP NS_NewXULTreeBuilder(nsISupports* aOuter, REFNSIID aIID, void** aResult); #endif -PR_STATIC_CALLBACK(nsresult) Initialize(nsIModule* aSelf); +static nsresult Initialize(nsIModule* aSelf); static void Shutdown(); #ifdef MOZ_XTF @@ -326,7 +326,7 @@ static PRBool gInitialized = PR_FALSE; // Perform our one-time intialization for this module // static -nsresult PR_CALLBACK +nsresult Initialize(nsIModule* aSelf) { NS_PRECONDITION(!gInitialized, "module already initialized"); diff --git a/layout/generic/nsFrameList.cpp b/layout/generic/nsFrameList.cpp index 71d47adc92aa..9556f30ce52e 100644 --- a/layout/generic/nsFrameList.cpp +++ b/layout/generic/nsFrameList.cpp @@ -327,8 +327,7 @@ nsFrameList::GetLength() const return count; } -static int PR_CALLBACK CompareByContentOrder(const void* aF1, const void* aF2, - void* aDummy) +static int CompareByContentOrder(const void* aF1, const void* aF2, void* aDummy) { const nsIFrame* f1 = static_cast(aF1); const nsIFrame* f2 = static_cast(aF2); diff --git a/layout/generic/nsHTMLReflowState.cpp b/layout/generic/nsHTMLReflowState.cpp index 3c0087fefd89..5e740d460bc9 100644 --- a/layout/generic/nsHTMLReflowState.cpp +++ b/layout/generic/nsHTMLReflowState.cpp @@ -1546,7 +1546,7 @@ nsHTMLReflowState::ComputeContainingBlockRectangle(nsPresContext* aPres } // Prefs callback to pick up changes -PR_STATIC_CALLBACK(int) +static int PrefsChanged(const char *aPrefName, void *instance) { sBlinkIsAllowed = diff --git a/layout/generic/nsIntervalSet.h b/layout/generic/nsIntervalSet.h index 97c4807dedee..eaccbb4da4c4 100644 --- a/layout/generic/nsIntervalSet.h +++ b/layout/generic/nsIntervalSet.h @@ -46,10 +46,10 @@ #include "nsDebug.h" typedef void * -(* PR_CALLBACK IntervalSetAlloc)(size_t aBytes, void *aClosure); +(* IntervalSetAlloc)(size_t aBytes, void *aClosure); typedef void -(* PR_CALLBACK IntervalSetFree) (size_t aBytes, void *aPtr, void *aClosure); +(* IntervalSetFree) (size_t aBytes, void *aPtr, void *aClosure); /* * A list-based class (hopefully tree-based when I get around to it) diff --git a/layout/generic/nsSpaceManager.cpp b/layout/generic/nsSpaceManager.cpp index e48151e9bb2c..499151ac4d65 100644 --- a/layout/generic/nsSpaceManager.cpp +++ b/layout/generic/nsSpaceManager.cpp @@ -91,14 +91,14 @@ nsSpaceManager::BandList::Clear() ///////////////////////////////////////////////////////////////////////////// // PresShell Arena allocate callback (for nsIntervalSet use below) -PR_STATIC_CALLBACK(void*) +static void* PSArenaAllocCB(size_t aSize, void* aClosure) { return static_cast(aClosure)->AllocateFrame(aSize); } // PresShell Arena free callback (for nsIntervalSet use below) -PR_STATIC_CALLBACK(void) +static void PSArenaFreeCB(size_t aSize, void* aPtr, void* aClosure) { static_cast(aClosure)->FreeFrame(aSize, aPtr); diff --git a/layout/style/nsCSSLoader.cpp b/layout/style/nsCSSLoader.cpp index 7da673ad4191..6c2cbb1a5bb0 100644 --- a/layout/style/nsCSSLoader.cpp +++ b/layout/style/nsCSSLoader.cpp @@ -333,7 +333,7 @@ CSSLoaderImpl::SetCompatibilityMode(nsCompatibility aCompatMode) return NS_OK; } -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator CollectNonAlternates(nsURIAndPrincipalHashKey *aKey, SheetLoadData* &aData, void* aClosure) @@ -2146,7 +2146,7 @@ nsresult NS_NewCSSLoader(nsICSSLoader** aLoader) return CallQueryInterface(it, aLoader); } -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator StopLoadingSheetCallback(nsURIAndPrincipalHashKey* aKey, SheetLoadData*& aData, void* aClosure) @@ -2213,7 +2213,7 @@ struct StopLoadingSheetsByURIClosure { CSSLoaderImpl::LoadDataArray& array; }; -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator StopLoadingSheetByURICallback(nsURIAndPrincipalHashKey* aKey, SheetLoadData*& aData, void* aClosure) @@ -2328,7 +2328,7 @@ CSSLoaderImpl::RemoveObserver(nsICSSLoaderObserver* aObserver) mObservers.RemoveElement(aObserver); } -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator CollectLoadDatas(nsURIAndPrincipalHashKey *aKey, SheetLoadData* &aData, void* aClosure) diff --git a/layout/style/nsCSSParser.cpp b/layout/style/nsCSSParser.cpp index 6e06729c352d..f30548f13d1f 100644 --- a/layout/style/nsCSSParser.cpp +++ b/layout/style/nsCSSParser.cpp @@ -592,12 +592,12 @@ protected: #endif }; -PR_STATIC_CALLBACK(void) AppendRuleToArray(nsICSSRule* aRule, void* aArray) +static void AppendRuleToArray(nsICSSRule* aRule, void* aArray) { static_cast*>(aArray)->AppendObject(aRule); } -PR_STATIC_CALLBACK(void) AppendRuleToSheet(nsICSSRule* aRule, void* aParser) +static void AppendRuleToSheet(nsICSSRule* aRule, void* aParser) { CSSParserImpl* parser = (CSSParserImpl*) aParser; parser->AppendRule(aRule); diff --git a/layout/style/nsCSSRuleProcessor.cpp b/layout/style/nsCSSRuleProcessor.cpp index c63a29a79154..870a9072e6d1 100644 --- a/layout/style/nsCSSRuleProcessor.cpp +++ b/layout/style/nsCSSRuleProcessor.cpp @@ -142,7 +142,7 @@ struct RuleHashTableEntry : public PLDHashEntryHdr { RuleValue *mRules; // linked list of |RuleValue|, null-terminated }; -PR_STATIC_CALLBACK(PLDHashNumber) +static PLDHashNumber RuleHash_CIHashKey(PLDHashTable *table, const void *key) { nsIAtom *atom = const_cast(static_cast(key)); @@ -154,8 +154,7 @@ RuleHash_CIHashKey(PLDHashTable *table, const void *key) } typedef nsIAtom* -(* PR_CALLBACK RuleHashGetKey) (PLDHashTable *table, - const PLDHashEntryHdr *entry); +(* RuleHashGetKey) (PLDHashTable *table, const PLDHashEntryHdr *entry); struct RuleHashTableOps { PLDHashTableOps ops; @@ -172,7 +171,7 @@ ToLocalOps(const PLDHashTableOps *aOps) (((const char*) aOps) - offsetof(RuleHashTableOps, ops)); } -PR_STATIC_CALLBACK(PRBool) +static PRBool RuleHash_CIMatchEntry(PLDHashTable *table, const PLDHashEntryHdr *hdr, const void *key) { @@ -192,7 +191,7 @@ RuleHash_CIMatchEntry(PLDHashTable *table, const PLDHashEntryHdr *hdr, return (nsCRT::strcasecmp(entry_str, match_str) == 0); } -PR_STATIC_CALLBACK(PRBool) +static PRBool RuleHash_CSMatchEntry(PLDHashTable *table, const PLDHashEntryHdr *hdr, const void *key) { @@ -204,7 +203,7 @@ RuleHash_CSMatchEntry(PLDHashTable *table, const PLDHashEntryHdr *hdr, return match_atom == entry_atom; } -PR_STATIC_CALLBACK(nsIAtom*) +static nsIAtom* RuleHash_TagTable_GetKey(PLDHashTable *table, const PLDHashEntryHdr *hdr) { const RuleHashTableEntry *entry = @@ -212,7 +211,7 @@ RuleHash_TagTable_GetKey(PLDHashTable *table, const PLDHashEntryHdr *hdr) return entry->mRules->mSelector->mTag; } -PR_STATIC_CALLBACK(nsIAtom*) +static nsIAtom* RuleHash_ClassTable_GetKey(PLDHashTable *table, const PLDHashEntryHdr *hdr) { const RuleHashTableEntry *entry = @@ -220,7 +219,7 @@ RuleHash_ClassTable_GetKey(PLDHashTable *table, const PLDHashEntryHdr *hdr) return entry->mRules->mSelector->mClassList->mAtom; } -PR_STATIC_CALLBACK(nsIAtom*) +static nsIAtom* RuleHash_IdTable_GetKey(PLDHashTable *table, const PLDHashEntryHdr *hdr) { const RuleHashTableEntry *entry = @@ -228,13 +227,13 @@ RuleHash_IdTable_GetKey(PLDHashTable *table, const PLDHashEntryHdr *hdr) return entry->mRules->mSelector->mIDList->mAtom; } -PR_STATIC_CALLBACK(PLDHashNumber) +static PLDHashNumber RuleHash_NameSpaceTable_HashKey(PLDHashTable *table, const void *key) { return NS_PTR_TO_INT32(key); } -PR_STATIC_CALLBACK(PRBool) +static PRBool RuleHash_NameSpaceTable_MatchEntry(PLDHashTable *table, const PLDHashEntryHdr *hdr, const void *key) @@ -663,7 +662,7 @@ struct AttributeSelectorEntry : public PLDHashEntryHdr { nsVoidArray *mSelectors; }; -PR_STATIC_CALLBACK(void) +static void AttributeSelectorClearEntry(PLDHashTable *table, PLDHashEntryHdr *hdr) { AttributeSelectorEntry *entry = static_cast(hdr); @@ -1978,7 +1977,7 @@ struct StateEnumData { nsReStyleHint change; }; -PR_STATIC_CALLBACK(PRBool) StateEnumFunc(void* aSelector, void* aData) +static PRBool StateEnumFunc(void* aSelector, void* aData) { StateEnumData *enumData = static_cast(aData); StateRuleProcessorData *data = enumData->data; @@ -2032,7 +2031,7 @@ struct AttributeEnumData { }; -PR_STATIC_CALLBACK(PRBool) AttributeEnumFunc(void* aSelector, void* aData) +static PRBool AttributeEnumFunc(void* aSelector, void* aData) { AttributeEnumData *enumData = static_cast(aData); AttributeRuleProcessorData *data = enumData->data; @@ -2244,13 +2243,13 @@ struct RuleByWeightEntry : public PLDHashEntryHdr { PerWeightData data; // mWeight is key, mRules are value }; -PR_STATIC_CALLBACK(PLDHashNumber) +static PLDHashNumber HashIntKey(PLDHashTable *table, const void *key) { return PLDHashNumber(NS_PTR_TO_INT32(key)); } -PR_STATIC_CALLBACK(PRBool) +static PRBool MatchWeightEntry(PLDHashTable *table, const PLDHashEntryHdr *hdr, const void *key) { @@ -2497,8 +2496,8 @@ nsCSSRuleProcessor::CascadeSheetRulesInto(nsICSSStyleSheet* aSheet, void* aData) return PR_TRUE; } -PR_STATIC_CALLBACK(int) CompareWeightData(const void* aArg1, const void* aArg2, - void* closure) +static int CompareWeightData(const void* aArg1, const void* aArg2, + void* closure) { const PerWeightData* arg1 = static_cast(aArg1); const PerWeightData* arg2 = static_cast(aArg2); @@ -2517,7 +2516,7 @@ struct FillWeightArrayData { }; -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator FillWeightArray(PLDHashTable *table, PLDHashEntryHdr *hdr, PRUint32 number, void *arg) { diff --git a/layout/style/nsCSSScanner.cpp b/layout/style/nsCSSScanner.cpp index 6e961361a7db..f853dcd009de 100644 --- a/layout/style/nsCSSScanner.cpp +++ b/layout/style/nsCSSScanner.cpp @@ -268,7 +268,7 @@ nsCSSScanner::SetLowLevelError(nsresult aErrorCode) #ifdef CSS_REPORT_PARSE_ERRORS #define CSS_ERRORS_PREF "layout.css.report_errors" -PR_STATIC_CALLBACK(int) +static int CSSErrorsPrefChanged(const char *aPref, void *aClosure) { gReportErrors = nsContentUtils::GetBoolPref(CSS_ERRORS_PREF, PR_TRUE); diff --git a/layout/style/nsCSSStyleSheet.cpp b/layout/style/nsCSSStyleSheet.cpp index 95fc1b1ccedd..14429db2c4f2 100644 --- a/layout/style/nsCSSStyleSheet.cpp +++ b/layout/style/nsCSSStyleSheet.cpp @@ -1565,7 +1565,7 @@ void nsCSSStyleSheet::List(FILE* out, PRInt32 aIndent) const } #endif -static PRBool PR_CALLBACK +static PRBool EnumClearRuleCascades(void* aProcessor, void* aData) { nsCSSRuleProcessor* processor = diff --git a/layout/style/nsHTMLStyleSheet.cpp b/layout/style/nsHTMLStyleSheet.cpp index f385db58f118..ad1303809f77 100644 --- a/layout/style/nsHTMLStyleSheet.cpp +++ b/layout/style/nsHTMLStyleSheet.cpp @@ -302,7 +302,7 @@ struct MappedAttrTableEntry : public PLDHashEntryHdr { nsMappedAttributes *mAttributes; }; -PR_STATIC_CALLBACK(PLDHashNumber) +static PLDHashNumber MappedAttrTable_HashKey(PLDHashTable *table, const void *key) { nsMappedAttributes *attributes = @@ -311,7 +311,7 @@ MappedAttrTable_HashKey(PLDHashTable *table, const void *key) return attributes->HashValue(); } -PR_STATIC_CALLBACK(void) +static void MappedAttrTable_ClearEntry(PLDHashTable *table, PLDHashEntryHdr *hdr) { MappedAttrTableEntry *entry = static_cast(hdr); @@ -320,7 +320,7 @@ MappedAttrTable_ClearEntry(PLDHashTable *table, PLDHashEntryHdr *hdr) memset(entry, 0, sizeof(MappedAttrTableEntry)); } -PR_STATIC_CALLBACK(PRBool) +static PRBool MappedAttrTable_MatchEntry(PLDHashTable *table, const PLDHashEntryHdr *hdr, const void *key) { diff --git a/layout/style/nsICSSParser.h b/layout/style/nsICSSParser.h index f5be154ae504..4e302908534b 100644 --- a/layout/style/nsICSSParser.h +++ b/layout/style/nsICSSParser.h @@ -62,7 +62,7 @@ struct nsCSSSelectorList; { 0xb2, 0x5a, 0x24, 0xff, 0x09, 0xc3, 0x70, 0xef } } // Rule processing function -typedef void (*PR_CALLBACK RuleAppendFunc) (nsICSSRule* aRule, void* aData); +typedef void (* RuleAppendFunc) (nsICSSRule* aRule, void* aData); // Interface to the css parser. class nsICSSParser : public nsISupports { diff --git a/layout/style/nsIStyleRuleProcessor.h b/layout/style/nsIStyleRuleProcessor.h index 51792608a763..e5b7b82fd912 100644 --- a/layout/style/nsIStyleRuleProcessor.h +++ b/layout/style/nsIStyleRuleProcessor.h @@ -238,7 +238,7 @@ public: // Shorthand for: // nsCOMArray::nsCOMArrayEnumFunc - typedef PRBool (* PR_CALLBACK EnumFunc)(nsIStyleRuleProcessor*, void*); + typedef PRBool (* EnumFunc)(nsIStyleRuleProcessor*, void*); /** * Find the |nsIStyleRule|s matching the given content node and diff --git a/layout/style/nsMediaFeatures.cpp b/layout/style/nsMediaFeatures.cpp index abbefb137303..717c34a5c1c2 100644 --- a/layout/style/nsMediaFeatures.cpp +++ b/layout/style/nsMediaFeatures.cpp @@ -59,7 +59,7 @@ static const PRInt32 kScanKeywords[] = { eCSSKeyword_UNKNOWN, -1 }; -PR_STATIC_CALLBACK(nsresult) +static nsresult GetWidth(nsPresContext* aPresContext, nsCSSValue& aResult) { nscoord width = aPresContext->GetVisibleArea().width; @@ -68,7 +68,7 @@ GetWidth(nsPresContext* aPresContext, nsCSSValue& aResult) return NS_OK; } -PR_STATIC_CALLBACK(nsresult) +static nsresult GetHeight(nsPresContext* aPresContext, nsCSSValue& aResult) { nscoord height = aPresContext->GetVisibleArea().height; @@ -93,7 +93,7 @@ GetDeviceContextFor(nsPresContext* aPresContext) return ctx; } -PR_STATIC_CALLBACK(nsresult) +static nsresult GetDeviceWidth(nsPresContext* aPresContext, nsCSSValue& aResult) { // XXX: I'm not sure if this is really the right thing for print: @@ -106,7 +106,7 @@ GetDeviceWidth(nsPresContext* aPresContext, nsCSSValue& aResult) return NS_OK; } -PR_STATIC_CALLBACK(nsresult) +static nsresult GetDeviceHeight(nsPresContext* aPresContext, nsCSSValue& aResult) { // XXX: I'm not sure if this is really the right thing for print: @@ -119,7 +119,7 @@ GetDeviceHeight(nsPresContext* aPresContext, nsCSSValue& aResult) return NS_OK; } -PR_STATIC_CALLBACK(nsresult) +static nsresult GetOrientation(nsPresContext* aPresContext, nsCSSValue& aResult) { nsSize size = aPresContext->GetVisibleArea().Size(); @@ -135,7 +135,7 @@ GetOrientation(nsPresContext* aPresContext, nsCSSValue& aResult) return NS_OK; } -PR_STATIC_CALLBACK(nsresult) +static nsresult GetAspectRatio(nsPresContext* aPresContext, nsCSSValue& aResult) { nsRefPtr a = nsCSSValue::Array::Create(2); @@ -149,7 +149,7 @@ GetAspectRatio(nsPresContext* aPresContext, nsCSSValue& aResult) return NS_OK; } -PR_STATIC_CALLBACK(nsresult) +static nsresult GetDeviceAspectRatio(nsPresContext* aPresContext, nsCSSValue& aResult) { nsRefPtr a = nsCSSValue::Array::Create(2); @@ -168,7 +168,7 @@ GetDeviceAspectRatio(nsPresContext* aPresContext, nsCSSValue& aResult) } -PR_STATIC_CALLBACK(nsresult) +static nsresult GetColor(nsPresContext* aPresContext, nsCSSValue& aResult) { // FIXME: This implementation is bogus. nsThebesDeviceContext @@ -191,7 +191,7 @@ GetColor(nsPresContext* aPresContext, nsCSSValue& aResult) return NS_OK; } -PR_STATIC_CALLBACK(nsresult) +static nsresult GetColorIndex(nsPresContext* aPresContext, nsCSSValue& aResult) { // We should return zero if the device does not use a color lookup @@ -204,7 +204,7 @@ GetColorIndex(nsPresContext* aPresContext, nsCSSValue& aResult) return NS_OK; } -PR_STATIC_CALLBACK(nsresult) +static nsresult GetMonochrome(nsPresContext* aPresContext, nsCSSValue& aResult) { // For color devices we should return 0. @@ -214,7 +214,7 @@ GetMonochrome(nsPresContext* aPresContext, nsCSSValue& aResult) return NS_OK; } -PR_STATIC_CALLBACK(nsresult) +static nsresult GetResolution(nsPresContext* aPresContext, nsCSSValue& aResult) { // Resolution values are in device pixels, not CSS pixels. @@ -224,7 +224,7 @@ GetResolution(nsPresContext* aPresContext, nsCSSValue& aResult) return NS_OK; } -PR_STATIC_CALLBACK(nsresult) +static nsresult GetScan(nsPresContext* aPresContext, nsCSSValue& aResult) { // Since Gecko doesn't support the 'tv' media type, the 'scan' @@ -233,7 +233,7 @@ GetScan(nsPresContext* aPresContext, nsCSSValue& aResult) return NS_OK; } -PR_STATIC_CALLBACK(nsresult) +static nsresult GetGrid(nsPresContext* aPresContext, nsCSSValue& aResult) { // Gecko doesn't support grid devices (e.g., ttys), so the 'grid' diff --git a/layout/style/nsMediaFeatures.h b/layout/style/nsMediaFeatures.h index 513f944c42f6..fe9877c8b60a 100644 --- a/layout/style/nsMediaFeatures.h +++ b/layout/style/nsMediaFeatures.h @@ -47,8 +47,7 @@ class nsPresContext; class nsCSSValue; typedef nsresult -(* PR_CALLBACK nsMediaFeatureValueGetter)(nsPresContext* aPresContext, - nsCSSValue& aResult); +(* nsMediaFeatureValueGetter)(nsPresContext* aPresContext, nsCSSValue& aResult); struct nsMediaFeature { nsIAtom **mName; // extra indirection to point to nsGkAtoms members diff --git a/layout/style/nsRuleNode.cpp b/layout/style/nsRuleNode.cpp index 31b235882f7a..f2c01dd99f18 100644 --- a/layout/style/nsRuleNode.cpp +++ b/layout/style/nsRuleNode.cpp @@ -81,7 +81,7 @@ struct ChildrenHashEntry : public PLDHashEntryHdr { nsRuleNode *mRuleNode; }; -/* static */ PR_CALLBACK PLDHashNumber +/* static */ PLDHashNumber nsRuleNode::ChildrenHashHashKey(PLDHashTable *aTable, const void *aKey) { const nsRuleNode::Key *key = @@ -91,7 +91,7 @@ nsRuleNode::ChildrenHashHashKey(PLDHashTable *aTable, const void *aKey) return PL_DHashVoidPtrKeyStub(aTable, key->mRule); } -/* static */ PR_CALLBACK PRBool +/* static */ PRBool nsRuleNode::ChildrenHashMatchEntry(PLDHashTable *aTable, const PLDHashEntryHdr *aHdr, const void *aKey) @@ -602,7 +602,7 @@ nsRuleNode::operator new(size_t sz, nsPresContext* aPresContext) CPP_THROW_NEW return aPresContext->AllocateFromShell(sz); } -/* static */ PR_CALLBACK PLDHashOperator +/* static */ PLDHashOperator nsRuleNode::EnqueueRuleNodeChildren(PLDHashTable *table, PLDHashEntryHdr *hdr, PRUint32 number, void *arg) { @@ -819,8 +819,8 @@ struct PropertyCheckData { * result, and it returns the revised one. */ typedef nsRuleNode::RuleDetail - (* PR_CALLBACK CheckCallbackFn)(const nsRuleDataStruct& aData, - nsRuleNode::RuleDetail aResult); + (* CheckCallbackFn)(const nsRuleDataStruct& aData, + nsRuleNode::RuleDetail aResult); /* the information for all the properties in a style struct */ struct StructCheckData { @@ -869,7 +869,7 @@ ExamineCSSRect(const nsCSSRect* aRect, } } -PR_STATIC_CALLBACK(nsRuleNode::RuleDetail) +static nsRuleNode::RuleDetail CheckFontCallback(const nsRuleDataStruct& aData, nsRuleNode::RuleDetail aResult) { @@ -910,7 +910,7 @@ CheckFontCallback(const nsRuleDataStruct& aData, return aResult; } -PR_STATIC_CALLBACK(nsRuleNode::RuleDetail) +static nsRuleNode::RuleDetail CheckColorCallback(const nsRuleDataStruct& aData, nsRuleNode::RuleDetail aResult) { @@ -5175,7 +5175,7 @@ nsRuleNode::Mark() node->mDependentBits |= NS_RULE_NODE_GC_MARK; } -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator SweepRuleNodeChildren(PLDHashTable *table, PLDHashEntryHdr *hdr, PRUint32 number, void *arg) { diff --git a/layout/style/nsRuleNode.h b/layout/style/nsRuleNode.h index b8f18ad8a5ae..1aee6a2177c7 100644 --- a/layout/style/nsRuleNode.h +++ b/layout/style/nsRuleNode.h @@ -361,17 +361,17 @@ private: } }; - static PR_CALLBACK PLDHashNumber + static PLDHashNumber ChildrenHashHashKey(PLDHashTable *aTable, const void *aKey); - static PR_CALLBACK PRBool + static PRBool ChildrenHashMatchEntry(PLDHashTable *aTable, const PLDHashEntryHdr *aHdr, const void *aKey); static PLDHashTableOps ChildrenHashOps; - static PR_CALLBACK PLDHashOperator + static PLDHashOperator EnqueueRuleNodeChildren(PLDHashTable *table, PLDHashEntryHdr *hdr, PRUint32 number, void *arg); diff --git a/layout/svg/base/src/nsSVGOuterSVGFrame.cpp b/layout/svg/base/src/nsSVGOuterSVGFrame.cpp index d80c6f897d67..7e534f1c8faf 100644 --- a/layout/svg/base/src/nsSVGOuterSVGFrame.cpp +++ b/layout/svg/base/src/nsSVGOuterSVGFrame.cpp @@ -385,7 +385,7 @@ nsSVGOuterSVGFrame::Reflow(nsPresContext* aPresContext, return NS_OK; } -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator ReflowForeignObject(nsVoidPtrHashKey *aEntry, void* aUserArg) { static_cast diff --git a/layout/svg/base/src/nsSVGUtils.cpp b/layout/svg/base/src/nsSVGUtils.cpp index 5a381a455ff2..1f5148b47386 100644 --- a/layout/svg/base/src/nsSVGUtils.cpp +++ b/layout/svg/base/src/nsSVGUtils.cpp @@ -165,7 +165,7 @@ static const PRUint8 gsRGBToLinearRGBMap[256] = { static PRBool gSVGEnabled; static const char SVG_PREF_STR[] = "svg.enabled"; -PR_STATIC_CALLBACK(int) +static int SVGPrefChanged(const char *aPref, void *aClosure) { PRBool prefVal = nsContentUtils::GetBoolPref(SVG_PREF_STR); diff --git a/layout/tables/SpanningCellSorter.cpp b/layout/tables/SpanningCellSorter.cpp index 173b9c766d64..0643aa54dd48 100644 --- a/layout/tables/SpanningCellSorter.cpp +++ b/layout/tables/SpanningCellSorter.cpp @@ -77,13 +77,13 @@ SpanningCellSorter::HashTableOps = { nsnull }; -/* static */ PR_CALLBACK PLDHashNumber +/* static */ PLDHashNumber SpanningCellSorter::HashTableHashKey(PLDHashTable *table, const void *key) { return NS_PTR_TO_INT32(key); } -/* static */ PR_CALLBACK PRBool +/* static */ PRBool SpanningCellSorter::HashTableMatchEntry(PLDHashTable *table, const PLDHashEntryHdr *hdr, const void *key) @@ -134,7 +134,7 @@ SpanningCellSorter::AddCell(PRInt32 aColSpan, PRInt32 aRow, PRInt32 aCol) return PR_TRUE; } -/* static */ PR_CALLBACK PLDHashOperator +/* static */ PLDHashOperator SpanningCellSorter::FillSortedArray(PLDHashTable *table, PLDHashEntryHdr *hdr, PRUint32 number, void *arg) { diff --git a/layout/tables/SpanningCellSorter.h b/layout/tables/SpanningCellSorter.h index cecffb8d9b05..3928e3505a2d 100644 --- a/layout/tables/SpanningCellSorter.h +++ b/layout/tables/SpanningCellSorter.h @@ -99,13 +99,13 @@ private: static PLDHashTableOps HashTableOps; - PR_STATIC_CALLBACK(PLDHashNumber) + static PLDHashNumber HashTableHashKey(PLDHashTable *table, const void *key); - PR_STATIC_CALLBACK(PRBool) + static PRBool HashTableMatchEntry(PLDHashTable *table, const PLDHashEntryHdr *hdr, const void *key); - PR_STATIC_CALLBACK(PLDHashOperator) + static PLDHashOperator FillSortedArray(PLDHashTable *table, PLDHashEntryHdr *hdr, PRUint32 number, void *arg); diff --git a/layout/xul/base/src/nsMenuPopupFrame.cpp b/layout/xul/base/src/nsMenuPopupFrame.cpp index fa0b8b964452..c1ccf5a63df9 100644 --- a/layout/xul/base/src/nsMenuPopupFrame.cpp +++ b/layout/xul/base/src/nsMenuPopupFrame.cpp @@ -560,7 +560,7 @@ nsMenuPopupFrame::InitializePopupWithAnchorAlign(nsIContent* aAnchorContent, } } -void PR_CALLBACK +void LazyGeneratePopupDone(nsIContent* aPopup, nsIFrame* aFrame, void* aArg) { // be safe and check the frame type diff --git a/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp b/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp index fd3c990fff57..3923d4af8440 100644 --- a/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp +++ b/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp @@ -114,7 +114,7 @@ static NS_DEFINE_CID(kWidgetCID, NS_CHILD_CID); // Enumeration function that cancels all the image requests in our cache -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator CancelImageRequest(const nsAString& aKey, nsTreeImageCacheEntry aEntry, void* aData) { diff --git a/layout/xul/base/src/tree/src/nsTreeStyleCache.cpp b/layout/xul/base/src/tree/src/nsTreeStyleCache.cpp index acadfc2d4ee2..63e9c2605cb3 100644 --- a/layout/xul/base/src/tree/src/nsTreeStyleCache.cpp +++ b/layout/xul/base/src/tree/src/nsTreeStyleCache.cpp @@ -116,7 +116,7 @@ nsTreeStyleCache::GetStyleContext(nsICSSPseudoComparator* aComparator, return result; } -PRBool PR_CALLBACK +PRBool nsTreeStyleCache::DeleteDFAState(nsHashKey *aKey, void *aData, void *closure) @@ -126,7 +126,7 @@ nsTreeStyleCache::DeleteDFAState(nsHashKey *aKey, return PR_TRUE; } -PRBool PR_CALLBACK +PRBool nsTreeStyleCache::ReleaseStyleContext(nsHashKey *aKey, void *aData, void *closure) diff --git a/layout/xul/base/src/tree/src/nsTreeStyleCache.h b/layout/xul/base/src/tree/src/nsTreeStyleCache.h index 7a5430a40e23..c0f41650c323 100644 --- a/layout/xul/base/src/tree/src/nsTreeStyleCache.h +++ b/layout/xul/base/src/tree/src/nsTreeStyleCache.h @@ -108,9 +108,9 @@ public: nsIAtom* aPseudoElement, nsISupportsArray* aInputWord); - static PRBool PR_CALLBACK DeleteDFAState(nsHashKey *aKey, void *aData, void *closure); + static PRBool DeleteDFAState(nsHashKey *aKey, void *aData, void *closure); - static PRBool PR_CALLBACK ReleaseStyleContext(nsHashKey *aKey, void *aData, void *closure); + static PRBool ReleaseStyleContext(nsHashKey *aKey, void *aData, void *closure); protected: // A transition table for a deterministic finite automaton. The DFA diff --git a/modules/libjar/nsJAR.cpp b/modules/libjar/nsJAR.cpp index af4371e4a3a5..612a527c8303 100644 --- a/modules/libjar/nsJAR.cpp +++ b/modules/libjar/nsJAR.cpp @@ -112,7 +112,7 @@ nsJARManifestItem::~nsJARManifestItem() //---------------------------------------------- // nsJAR constructor/destructor //---------------------------------------------- -PR_STATIC_CALLBACK(PRBool) +static PRBool DeleteManifestEntry(nsHashKey* aKey, void* aData, void* closure) { //-- deletes an entry in mManifestData. @@ -1094,7 +1094,7 @@ nsZipReaderCache::Init(PRUint32 cacheSize) return mLock ? NS_OK : NS_ERROR_OUT_OF_MEMORY; } -static PRBool PR_CALLBACK +static PRBool DropZipReaderCache(nsHashKey *aKey, void *aData, void* closure) { nsJAR* zip = (nsJAR*)aData; @@ -1168,7 +1168,7 @@ nsZipReaderCache::GetZip(nsIFile* zipFile, nsIZipReader* *result) return rv; } -static PRBool PR_CALLBACK +static PRBool FindOldestZip(nsHashKey *aKey, void *aData, void* closure) { nsJAR** oldestPtr = (nsJAR**)closure; @@ -1186,7 +1186,7 @@ FindOldestZip(nsHashKey *aKey, void *aData, void* closure) struct ZipFindData {nsJAR* zip; PRBool found;}; -static PRBool PR_CALLBACK +static PRBool FindZip(nsHashKey *aKey, void *aData, void* closure) { ZipFindData* find_data = (ZipFindData*)closure; @@ -1262,7 +1262,7 @@ nsZipReaderCache::ReleaseZip(nsJAR* zip) return NS_OK; } -static PRBool PR_CALLBACK +static PRBool FindFlushableZip(nsHashKey *aKey, void *aData, void* closure) { nsHashKey** flushableKeyPtr = (nsHashKey**)closure; diff --git a/modules/libjar/nsJARFactory.cpp b/modules/libjar/nsJARFactory.cpp index ca2a5cb20ebe..32c8fe4db04c 100644 --- a/modules/libjar/nsJARFactory.cpp +++ b/modules/libjar/nsJARFactory.cpp @@ -98,7 +98,7 @@ static const nsModuleComponentInfo components[] = }; // Jar module shutdown hook -static void PR_CALLBACK nsJarShutdown(nsIModule *module) +static void nsJarShutdown(nsIModule *module) { // Release cached buffers from zlib allocator delete gZlibAllocator; diff --git a/modules/libjar/nsZipArchive.cpp b/modules/libjar/nsZipArchive.cpp index 4f786c123503..e5089f717a29 100644 --- a/modules/libjar/nsZipArchive.cpp +++ b/modules/libjar/nsZipArchive.cpp @@ -446,7 +446,7 @@ void ProcessWindowsMessages() // we startup and disabled after we startup if memory is a concern. //*********************************************************** -PR_STATIC_CALLBACK(void *) +static void * zlibAlloc(void *opaque, uInt items, uInt size) { nsRecyclingAllocator *zallocator = (nsRecyclingAllocator *)opaque; @@ -461,7 +461,7 @@ zlibAlloc(void *opaque, uInt items, uInt size) return calloc(items, size); } -PR_STATIC_CALLBACK(void) +static void zlibFree(void *opaque, void *ptr) { nsRecyclingAllocator *zallocator = (nsRecyclingAllocator *)opaque; diff --git a/modules/libpr0n/build/nsImageModule.cpp b/modules/libpr0n/build/nsImageModule.cpp index 7f43bd1c9493..e6781fda2f26 100644 --- a/modules/libpr0n/build/nsImageModule.cpp +++ b/modules/libpr0n/build/nsImageModule.cpp @@ -310,14 +310,14 @@ static const nsModuleComponentInfo components[] = #endif }; -PR_STATIC_CALLBACK(nsresult) +static nsresult imglib_Initialize(nsIModule* aSelf) { imgLoader::InitCache(); return NS_OK; } -PR_STATIC_CALLBACK(void) +static void imglib_Shutdown(nsIModule* aSelf) { imgLoader::Shutdown(); diff --git a/modules/libpr0n/decoders/icon/nsIconModule.cpp b/modules/libpr0n/decoders/icon/nsIconModule.cpp index cf60f742f0b9..8ef095908588 100644 --- a/modules/libpr0n/decoders/icon/nsIconModule.cpp +++ b/modules/libpr0n/decoders/icon/nsIconModule.cpp @@ -110,13 +110,13 @@ static const nsModuleComponentInfo components[] = } }; -PR_STATIC_CALLBACK(nsresult) +static nsresult IconDecoderModuleCtor(nsIModule* aSelf) { return NS_OK; } -PR_STATIC_CALLBACK(void) +static void IconDecoderModuleDtor(nsIModule* aSelf) { #ifdef MOZ_WIDGET_GTK2 diff --git a/modules/libpref/src/nsPrefBranch.cpp b/modules/libpref/src/nsPrefBranch.cpp index 28057e302a91..a3618bc1f611 100644 --- a/modules/libpref/src/nsPrefBranch.cpp +++ b/modules/libpref/src/nsPrefBranch.cpp @@ -75,10 +75,10 @@ struct PrefCallbackData { // Prototypes -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator pref_enumChild(PLDHashTable *table, PLDHashEntryHdr *heh, PRUint32 i, void *arg); -PR_STATIC_CALLBACK(nsresult) +static nsresult NotifyObserver(const char *newpref, void *data); /* @@ -724,7 +724,7 @@ NS_IMETHODIMP nsPrefBranch::Observe(nsISupports *aSubject, const char *aTopic, c return NS_OK; } -PR_STATIC_CALLBACK(nsresult) NotifyObserver(const char *newpref, void *data) +static nsresult NotifyObserver(const char *newpref, void *data) { PrefCallbackData *pData = (PrefCallbackData *)data; @@ -865,7 +865,7 @@ nsresult nsPrefBranch::getValidatedPrefName(const char *aPrefName, const char ** return NS_OK; } -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator pref_enumChild(PLDHashTable *table, PLDHashEntryHdr *heh, PRUint32 i, void *arg) { diff --git a/modules/libpref/src/nsSharedPrefHandler.cpp b/modules/libpref/src/nsSharedPrefHandler.cpp index b0b791c22aa5..8d8eb04cbdea 100644 --- a/modules/libpref/src/nsSharedPrefHandler.cpp +++ b/modules/libpref/src/nsSharedPrefHandler.cpp @@ -66,8 +66,8 @@ const char kExceptionListCommentChar = '#'; const PRUint32 kCurrentPrefsTransactionDataVersion = 1; // Static function prototypes -static PRBool PR_CALLBACK enumFind(void* aElement, void *aData); -static PRBool PR_CALLBACK enumFree(void* aElement, void *aData); +static PRBool enumFind(void* aElement, void *aData); +static PRBool enumFree(void* aElement, void *aData); static PRInt32 ReadLine(FILE* inStm, nsACString& destString); @@ -363,7 +363,7 @@ NS_IMETHODIMP nsSharedPrefHandler::OnFlushReply(PRUint32 aQueueID, PRUint32 aSta // Static functions //***************************************************************************** -static PRBool PR_CALLBACK enumFind(void* aElement, void *aData) +static PRBool enumFind(void* aElement, void *aData) { char *elemStr = static_cast(aElement); char *searchStr = static_cast(aData); @@ -371,7 +371,7 @@ static PRBool PR_CALLBACK enumFind(void* aElement, void *aData) return (strncmp(elemStr, searchStr, strlen(elemStr)) != 0); } -static PRBool PR_CALLBACK enumFree(void* aElement, void *aData) +static PRBool enumFree(void* aElement, void *aData) { if (aElement) nsMemory::Free(aElement); diff --git a/modules/libpref/src/prefapi.cpp b/modules/libpref/src/prefapi.cpp index caca5b0c1944..25eaefb6a14a 100644 --- a/modules/libpref/src/prefapi.cpp +++ b/modules/libpref/src/prefapi.cpp @@ -85,7 +85,7 @@ #define BOGUS_DEFAULT_INT_PREF_VALUE (-5632) #define BOGUS_DEFAULT_BOOL_PREF_VALUE (-2) -PR_STATIC_CALLBACK(void) +static void clearPrefEntry(PLDHashTable *table, PLDHashEntryHdr *entry) { PrefHashEntry *pref = static_cast(entry); @@ -100,7 +100,7 @@ clearPrefEntry(PLDHashTable *table, PLDHashEntryHdr *entry) memset(entry, 0, table->entrySize); } -PR_STATIC_CALLBACK(PRBool) +static PRBool matchPrefEntry(PLDHashTable*, const PLDHashEntryHdr* entry, const void* key) { @@ -376,7 +376,7 @@ pref_savePref(PLDHashTable *table, PLDHashEntryHdr *heh, PRUint32 i, void *arg) return PL_DHASH_NEXT; } -int PR_CALLBACK +int pref_CompareStrings(const void *v1, const void *v2, void *unused) { char *s1 = *(char**) v1; @@ -518,7 +518,7 @@ nsresult PREF_GetBoolPref(const char *pref_name, PRBool * return_value, PRBool g } /* Delete a branch. Used for deleting mime types */ -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator pref_DeleteItem(PLDHashTable *table, PLDHashEntryHdr *heh, PRUint32 i, void *arg) { PrefHashEntry* he = static_cast(heh); @@ -587,7 +587,7 @@ PREF_ClearUserPref(const char *pref_name) return rv; } -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator pref_ClearUserPref(PLDHashTable *table, PLDHashEntryHdr *he, PRUint32, void *arg) { diff --git a/modules/libpref/src/prefapi_private_data.h b/modules/libpref/src/prefapi_private_data.h index 45934faab3dd..d3df383fe6ee 100644 --- a/modules/libpref/src/prefapi_private_data.h +++ b/modules/libpref/src/prefapi_private_data.h @@ -51,4 +51,4 @@ struct pref_saveArgs { PLDHashOperator pref_savePref(PLDHashTable *table, PLDHashEntryHdr *heh, PRUint32 i, void *arg); -int PR_CALLBACK pref_CompareStrings(const void *v1, const void *v2, void* unused); +int pref_CompareStrings(const void *v1, const void *v2, void* unused); diff --git a/modules/oji/src/lcglue.cpp b/modules/oji/src/lcglue.cpp index 3dbad6f36447..4a28cad48a14 100644 --- a/modules/oji/src/lcglue.cpp +++ b/modules/oji/src/lcglue.cpp @@ -87,7 +87,7 @@ private: }; -static void PR_CALLBACK detach_JVMContext(void* storage) +static void detach_JVMContext(void* storage) { JVMContext* context = reinterpret_cast(storage); diff --git a/modules/oji/src/nsJVMConfigManagerUnix.cpp b/modules/oji/src/nsJVMConfigManagerUnix.cpp index 744066de50f8..587e691dfb47 100644 --- a/modules/oji/src/nsJVMConfigManagerUnix.cpp +++ b/modules/oji/src/nsJVMConfigManagerUnix.cpp @@ -62,7 +62,7 @@ nsJVMConfigManagerUnix::nsJVMConfigManagerUnix() InitJVMConfigList(); } -PR_STATIC_CALLBACK(PRBool) +static PRBool FreeJVMConfig(nsHashKey *aKey, void *aData, void* aClosure) { nsJVMConfig* config = static_cast(aData); @@ -72,7 +72,7 @@ FreeJVMConfig(nsHashKey *aKey, void *aData, void* aClosure) return PR_TRUE; } -PR_STATIC_CALLBACK(PRBool) +static PRBool AppendJVMConfig(nsHashKey *aKey, void *aData, void* aClosure) { nsJVMConfig* config = static_cast(aData); diff --git a/modules/oji/src/nsJVMManager.cpp b/modules/oji/src/nsJVMManager.cpp index c426ae44ae96..8f862a9bef1e 100644 --- a/modules/oji/src/nsJVMManager.cpp +++ b/modules/oji/src/nsJVMManager.cpp @@ -274,7 +274,7 @@ nsJVMManager::NotifyAll(void* address) return (PR_CNotifyAll(address) == PR_SUCCESS ? NS_OK : NS_ERROR_FAILURE); } -static void PR_CALLBACK thread_starter(void* arg) +static void thread_starter(void* arg) { nsIRunnable* runnable = (nsIRunnable*) arg; if (runnable != NULL) { diff --git a/modules/plugin/base/src/nsJSNPRuntime.cpp b/modules/plugin/base/src/nsJSNPRuntime.cpp index 59f59d60b921..76df0c10638d 100644 --- a/modules/plugin/base/src/nsJSNPRuntime.cpp +++ b/modules/plugin/base/src/nsJSNPRuntime.cpp @@ -992,7 +992,7 @@ public: }; -PR_STATIC_CALLBACK(PLDHashNumber) +static PLDHashNumber JSObjWrapperHash(PLDHashTable *table, const void *key) { const nsJSObjWrapperKey *e = static_cast(key); @@ -1000,7 +1000,7 @@ JSObjWrapperHash(PLDHashTable *table, const void *key) return (PLDHashNumber)((PRWord)e->mJSObj ^ (PRWord)e->mNpp) >> 2; } -PR_STATIC_CALLBACK(PRBool) +static PRBool JSObjWrapperHashMatchEntry(PLDHashTable *table, const PLDHashEntryHdr *entry, const void *key) { @@ -1756,7 +1756,7 @@ nsNPObjWrapper::GetNewOrUsed(NPP npp, JSContext *cx, NPObject *npobj) // PLDHashTable enumeration callbacks for destruction code. -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator JSObjWrapperPluginDestroyedCallback(PLDHashTable *table, PLDHashEntryHdr *hdr, PRUint32 number, void *arg) { @@ -1792,7 +1792,7 @@ struct NppAndCx JSContext *cx; }; -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator NPObjWrapperPluginDestroyedCallback(PLDHashTable *table, PLDHashEntryHdr *hdr, PRUint32 number, void *arg) { diff --git a/modules/plugin/base/src/nsPluginHostImpl.cpp b/modules/plugin/base/src/nsPluginHostImpl.cpp index b77e049c9c55..41f22f063ded 100644 --- a/modules/plugin/base/src/nsPluginHostImpl.cpp +++ b/modules/plugin/base/src/nsPluginHostImpl.cpp @@ -4969,7 +4969,7 @@ struct pluginFileinDirectory // QuickSort callback for comparing the modification time of two files // if the times are the same, compare the filenames -static int PR_CALLBACK ComparePluginFileInDirectory (const void *v1, const void *v2, void *) +static int ComparePluginFileInDirectory (const void *v1, const void *v2, void *) { const pluginFileinDirectory* pfd1 = static_cast(v1); const pluginFileinDirectory* pfd2 = static_cast(v2); diff --git a/netwerk/base/src/nsBaseChannel.cpp b/netwerk/base/src/nsBaseChannel.cpp index 333ae29c5df3..8e66d59dc186 100644 --- a/netwerk/base/src/nsBaseChannel.cpp +++ b/netwerk/base/src/nsBaseChannel.cpp @@ -47,7 +47,7 @@ #include "nsIStreamConverterService.h" #include "nsIContentSniffer.h" -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator CopyProperties(const nsAString &key, nsIVariant *data, void *closure) { nsIWritablePropertyBag *bag = diff --git a/netwerk/base/src/nsDirectoryIndexStream.cpp b/netwerk/base/src/nsDirectoryIndexStream.cpp index 961403f034b3..25f380175c6d 100644 --- a/netwerk/base/src/nsDirectoryIndexStream.cpp +++ b/netwerk/base/src/nsDirectoryIndexStream.cpp @@ -91,9 +91,7 @@ nsDirectoryIndexStream::nsDirectoryIndexStream() ("nsDirectoryIndexStream[%p]: created", this)); } -static int PR_CALLBACK compare(nsIFile* aElement1, - nsIFile* aElement2, - void* aData) +static int compare(nsIFile* aElement1, nsIFile* aElement2, void* aData) { if (!NS_IsNativeUTF8()) { // don't check for errors, because we can't report them anyway diff --git a/netwerk/base/src/nsIOThreadPool.cpp b/netwerk/base/src/nsIOThreadPool.cpp index 9abfca173116..e52961b2564f 100644 --- a/netwerk/base/src/nsIOThreadPool.cpp +++ b/netwerk/base/src/nsIOThreadPool.cpp @@ -85,7 +85,7 @@ public: private: virtual ~nsIOThreadPool(); - PR_STATIC_CALLBACK(void) ThreadFunc(void *); + static void ThreadFunc(void *); // mLock protects all (exceptions during Init and Shutdown) PRLock *mLock; diff --git a/netwerk/base/src/nsLoadGroup.cpp b/netwerk/base/src/nsLoadGroup.cpp index 110f1b90cdf7..c2148b73b1b5 100644 --- a/netwerk/base/src/nsLoadGroup.cpp +++ b/netwerk/base/src/nsLoadGroup.cpp @@ -81,7 +81,7 @@ public: nsCOMPtr mKey; }; -PR_STATIC_CALLBACK(PRBool) +static PRBool RequestHashMatchEntry(PLDHashTable *table, const PLDHashEntryHdr *entry, const void *key) { @@ -92,7 +92,7 @@ RequestHashMatchEntry(PLDHashTable *table, const PLDHashEntryHdr *entry, return e->mKey == request; } -PR_STATIC_CALLBACK(void) +static void RequestHashClearEntry(PLDHashTable *table, PLDHashEntryHdr *entry) { RequestMapEntry *e = static_cast(entry); @@ -101,7 +101,7 @@ RequestHashClearEntry(PLDHashTable *table, PLDHashEntryHdr *entry) e->~RequestMapEntry(); } -PR_STATIC_CALLBACK(PRBool) +static PRBool RequestHashInitEntry(PLDHashTable *table, PLDHashEntryHdr *entry, const void *key) { @@ -122,7 +122,7 @@ RescheduleRequest(nsIRequest *aRequest, PRInt32 delta) p->AdjustPriority(delta); } -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator RescheduleRequests(PLDHashTable *table, PLDHashEntryHdr *hdr, PRUint32 number, void *arg) { @@ -244,7 +244,7 @@ nsLoadGroup::GetStatus(nsresult *status) // PLDHashTable enumeration callback that appends strong references to // all nsIRequest to an nsVoidArray. -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator AppendRequestsToVoidArray(PLDHashTable *table, PLDHashEntryHdr *hdr, PRUint32 number, void *arg) { @@ -267,7 +267,7 @@ AppendRequestsToVoidArray(PLDHashTable *table, PLDHashEntryHdr *hdr, // nsVoidArray enumeration callback that releases all items in the // nsVoidArray -PR_STATIC_CALLBACK(PRBool) +static PRBool ReleaseVoidArrayItems(void *aElement, void *aData) { nsISupports *s = static_cast(aElement); @@ -706,7 +706,7 @@ nsLoadGroup::RemoveRequest(nsIRequest *request, nsISupports* ctxt, // PLDHashTable enumeration callback that appends all items in the // hash to an nsISupportsArray. -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator AppendRequestsToISupportsArray(PLDHashTable *table, PLDHashEntryHdr *hdr, PRUint32 number, void *arg) { diff --git a/netwerk/base/src/nsProtocolProxyService.cpp b/netwerk/base/src/nsProtocolProxyService.cpp index 937fb334e1e4..63f4048e079f 100644 --- a/netwerk/base/src/nsProtocolProxyService.cpp +++ b/netwerk/base/src/nsProtocolProxyService.cpp @@ -1041,7 +1041,7 @@ nsProtocolProxyService::UnregisterFilter(nsIProtocolProxyFilter *filter) return NS_OK; } -PRBool PR_CALLBACK +PRBool nsProtocolProxyService::CleanupFilterArray(void *aElement, void *aData) { if (aElement) diff --git a/netwerk/base/src/nsProtocolProxyService.h b/netwerk/base/src/nsProtocolProxyService.h index f7d19e16ddc4..65ad0ae5ad37 100644 --- a/netwerk/base/src/nsProtocolProxyService.h +++ b/netwerk/base/src/nsProtocolProxyService.h @@ -290,7 +290,7 @@ protected: */ NS_HIDDEN_(PRBool) CanUseProxy(nsIURI *uri, PRInt32 defaultPort); - static PRBool PR_CALLBACK CleanupFilterArray(void *aElement, void *aData); + static PRBool CleanupFilterArray(void *aElement, void *aData); public: // The Sun Forte compiler and others implement older versions of the diff --git a/netwerk/build/nsNetModule.cpp b/netwerk/build/nsNetModule.cpp index a749f9ab60ab..6e894aea381f 100644 --- a/netwerk/build/nsNetModule.cpp +++ b/netwerk/build/nsNetModule.cpp @@ -598,7 +598,7 @@ CreateNewNSTXTToHTMLConvFactory(nsISupports *aOuter, REFNSIID aIID, void **aResu // Module implementation for the net library // Net module startup hook -PR_STATIC_CALLBACK(nsresult) nsNetStartup(nsIModule *neckoModule) +static nsresult nsNetStartup(nsIModule *neckoModule) { gNetStrings = new nsNetStrings(); return gNetStrings ? NS_OK : NS_ERROR_OUT_OF_MEMORY; @@ -606,7 +606,7 @@ PR_STATIC_CALLBACK(nsresult) nsNetStartup(nsIModule *neckoModule) // Net module shutdown hook -static void PR_CALLBACK nsNetShutdown(nsIModule *neckoModule) +static void nsNetShutdown(nsIModule *neckoModule) { // Release the url parser that the stdurl is holding. nsStandardURL::ShutdownGlobalObjects(); diff --git a/netwerk/cache/src/nsCacheEntry.cpp b/netwerk/cache/src/nsCacheEntry.cpp index 5fa46bf70e6a..eb1e0cadcf97 100644 --- a/netwerk/cache/src/nsCacheEntry.cpp +++ b/netwerk/cache/src/nsCacheEntry.cpp @@ -500,13 +500,13 @@ nsCacheEntryHashTable::VisitEntries( PLDHashEnumerator etor, void *arg) * hash table operation callback functions */ -PLDHashNumber PR_CALLBACK +PLDHashNumber nsCacheEntryHashTable::HashKey( PLDHashTable *table, const void *key) { return PL_DHashStringKey(table,((nsCString *)key)->get()); } -PRBool PR_CALLBACK +PRBool nsCacheEntryHashTable::MatchEntry(PLDHashTable * /* table */, const PLDHashEntryHdr * hashEntry, const void * key) @@ -518,7 +518,7 @@ nsCacheEntryHashTable::MatchEntry(PLDHashTable * /* table */, } -void PR_CALLBACK +void nsCacheEntryHashTable::MoveEntry(PLDHashTable * /* table */, const PLDHashEntryHdr *from, PLDHashEntryHdr *to) @@ -528,7 +528,7 @@ nsCacheEntryHashTable::MoveEntry(PLDHashTable * /* table */, } -void PR_CALLBACK +void nsCacheEntryHashTable::ClearEntry(PLDHashTable * /* table */, PLDHashEntryHdr * hashEntry) { diff --git a/netwerk/cache/src/nsCacheEntry.h b/netwerk/cache/src/nsCacheEntry.h index 1459c3f56bff..3b019335263d 100644 --- a/netwerk/cache/src/nsCacheEntry.h +++ b/netwerk/cache/src/nsCacheEntry.h @@ -299,30 +299,30 @@ public: private: // PLDHashTable operation callbacks - static PLDHashNumber PR_CALLBACK HashKey( PLDHashTable *table, const void *key); + static PLDHashNumber HashKey( PLDHashTable *table, const void *key); - static PRBool PR_CALLBACK MatchEntry( PLDHashTable * table, - const PLDHashEntryHdr * entry, - const void * key); + static PRBool MatchEntry( PLDHashTable * table, + const PLDHashEntryHdr * entry, + const void * key); - static void PR_CALLBACK MoveEntry( PLDHashTable *table, - const PLDHashEntryHdr *from, - PLDHashEntryHdr *to); + static void MoveEntry( PLDHashTable *table, + const PLDHashEntryHdr *from, + PLDHashEntryHdr *to); - static void PR_CALLBACK ClearEntry( PLDHashTable *table, PLDHashEntryHdr *entry); + static void ClearEntry( PLDHashTable *table, PLDHashEntryHdr *entry); - static void PR_CALLBACK Finalize( PLDHashTable *table); + static void Finalize( PLDHashTable *table); static - PLDHashOperator PR_CALLBACK FreeCacheEntries(PLDHashTable * table, - PLDHashEntryHdr * hdr, - PRUint32 number, - void * arg); + PLDHashOperator FreeCacheEntries(PLDHashTable * table, + PLDHashEntryHdr * hdr, + PRUint32 number, + void * arg); static - PLDHashOperator PR_CALLBACK VisitEntry(PLDHashTable * table, - PLDHashEntryHdr * hdr, - PRUint32 number, - void * arg); + PLDHashOperator VisitEntry(PLDHashTable * table, + PLDHashEntryHdr * hdr, + PRUint32 number, + void * arg); // member variables static PLDHashTableOps ops; diff --git a/netwerk/cache/src/nsCacheService.cpp b/netwerk/cache/src/nsCacheService.cpp index 082c9b702a56..b2f66a2cbe05 100644 --- a/netwerk/cache/src/nsCacheService.cpp +++ b/netwerk/cache/src/nsCacheService.cpp @@ -1942,7 +1942,7 @@ nsCacheService::ClearActiveEntries() } -PLDHashOperator PR_CALLBACK +PLDHashOperator nsCacheService::DeactivateAndClearEntry(PLDHashTable * table, PLDHashEntryHdr * hdr, PRUint32 number, @@ -1973,7 +1973,7 @@ nsCacheService::DoomActiveEntries() } -PLDHashOperator PR_CALLBACK +PLDHashOperator nsCacheService::RemoveActiveEntry(PLDHashTable * table, PLDHashEntryHdr * hdr, PRUint32 number, diff --git a/netwerk/cache/src/nsCacheService.h b/netwerk/cache/src/nsCacheService.h index fb361e6c53b9..f7fa880e2318 100644 --- a/netwerk/cache/src/nsCacheService.h +++ b/netwerk/cache/src/nsCacheService.h @@ -213,15 +213,15 @@ private: void DoomActiveEntries(void); static - PLDHashOperator PR_CALLBACK DeactivateAndClearEntry(PLDHashTable * table, - PLDHashEntryHdr * hdr, - PRUint32 number, - void * arg); + PLDHashOperator DeactivateAndClearEntry(PLDHashTable * table, + PLDHashEntryHdr * hdr, + PRUint32 number, + void * arg); static - PLDHashOperator PR_CALLBACK RemoveActiveEntry(PLDHashTable * table, - PLDHashEntryHdr * hdr, - PRUint32 number, - void * arg); + PLDHashOperator RemoveActiveEntry(PLDHashTable * table, + PLDHashEntryHdr * hdr, + PRUint32 number, + void * arg); #if defined(PR_LOGGING) void LogCacheStatistics(); #endif diff --git a/netwerk/cache/src/nsDeleteDir.cpp b/netwerk/cache/src/nsDeleteDir.cpp index 830dca855e6d..e6891b86a3a1 100644 --- a/netwerk/cache/src/nsDeleteDir.cpp +++ b/netwerk/cache/src/nsDeleteDir.cpp @@ -41,7 +41,7 @@ #include "nsString.h" #include "prthread.h" -PR_STATIC_CALLBACK(void) DeleteDirThreadFunc(void *arg) +static void DeleteDirThreadFunc(void *arg) { nsIFile *dir = static_cast(arg); dir->Remove(PR_TRUE); diff --git a/netwerk/cache/src/nsDiskCacheBinding.cpp b/netwerk/cache/src/nsDiskCacheBinding.cpp index ed60b12a6e73..c5be5aada077 100644 --- a/netwerk/cache/src/nsDiskCacheBinding.cpp +++ b/netwerk/cache/src/nsDiskCacheBinding.cpp @@ -60,14 +60,14 @@ struct HashTableEntry : PLDHashEntryHdr { }; -static PLDHashNumber PR_CALLBACK +static PLDHashNumber HashKey( PLDHashTable *table, const void *key) { return (PLDHashNumber) NS_PTR_TO_INT32(key); } -static PRBool PR_CALLBACK +static PRBool MatchEntry(PLDHashTable * /* table */, const PLDHashEntryHdr * header, const void * key) @@ -76,7 +76,7 @@ MatchEntry(PLDHashTable * /* table */, return (hashEntry->mBinding->mRecord.HashNumber() == (PLDHashNumber) NS_PTR_TO_INT32(key)); } -static void PR_CALLBACK +static void MoveEntry(PLDHashTable * /* table */, const PLDHashEntryHdr * src, PLDHashEntryHdr * dst) @@ -85,7 +85,7 @@ MoveEntry(PLDHashTable * /* table */, } -static void PR_CALLBACK +static void ClearEntry(PLDHashTable * /* table */, PLDHashEntryHdr * header) { @@ -364,7 +364,7 @@ nsDiskCacheBindery::RemoveBinding(nsDiskCacheBinding * binding) * ActiveBinding : PLDHashTable enumerate function to verify active bindings */ -PLDHashOperator PR_CALLBACK +PLDHashOperator ActiveBinding(PLDHashTable * table, PLDHashEntryHdr * hdr, PRUint32 number, diff --git a/netwerk/cache/src/nsMemoryCacheDevice.cpp b/netwerk/cache/src/nsMemoryCacheDevice.cpp index 46efd5bbc29f..01846e351019 100644 --- a/netwerk/cache/src/nsMemoryCacheDevice.cpp +++ b/netwerk/cache/src/nsMemoryCacheDevice.cpp @@ -484,7 +484,7 @@ nsMemoryCacheDevice::SetCapacity(PRInt32 capacity) #ifdef DEBUG -static PLDHashOperator PR_CALLBACK +static PLDHashOperator CountEntry(PLDHashTable * table, PLDHashEntryHdr * hdr, PRUint32 number, void * arg) { PRInt32 *entryCount = (PRInt32 *)arg; diff --git a/netwerk/cookie/src/nsCookieService.cpp b/netwerk/cookie/src/nsCookieService.cpp index 75d7415ca8fb..6fdaeb768bba 100644 --- a/netwerk/cookie/src/nsCookieService.cpp +++ b/netwerk/cookie/src/nsCookieService.cpp @@ -338,7 +338,7 @@ LogSuccess(PRBool aSetCookie, nsIURI *aHostURI, const nsAFlatCString &aCookieStr ******************************************************************************/ // comparison function for sorting cookies before sending to a server. -PR_STATIC_CALLBACK(int) +static int compareCookiesForSending(const void *aElement1, const void *aElement2, void *aData) @@ -811,7 +811,7 @@ struct nsGetEnumeratorData PRInt64 currentTime; }; -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator COMArrayCallback(nsCookieEntry *aEntry, void *aArg) { @@ -2013,7 +2013,7 @@ nsCookieService::RemoveAllFromMemory() mCookieCount = 0; } -PLDHashOperator PR_CALLBACK +PLDHashOperator removeExpiredCallback(nsCookieEntry *aEntry, void *aArg) { @@ -2271,7 +2271,7 @@ nsCookieService::UpdateCookieInList(nsCookie *aCookie, PRInt64 aLastAccessed) } } -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator findOldestCallback(nsCookieEntry *aEntry, void *aArg) { diff --git a/netwerk/cookie/src/nsCookieService.h b/netwerk/cookie/src/nsCookieService.h index c64e08e38d7c..f8986de6332f 100644 --- a/netwerk/cookie/src/nsCookieService.h +++ b/netwerk/cookie/src/nsCookieService.h @@ -211,7 +211,7 @@ class nsCookieService : public nsICookieService static nsCookieService *gCookieService; // this callback needs access to member functions - friend PLDHashOperator PR_CALLBACK removeExpiredCallback(nsCookieEntry *aEntry, void *aArg); + friend PLDHashOperator removeExpiredCallback(nsCookieEntry *aEntry, void *aArg); }; #endif // nsCookieService_h__ diff --git a/netwerk/dns/src/nsHostResolver.cpp b/netwerk/dns/src/nsHostResolver.cpp index 924159e405cf..8d28814655e0 100644 --- a/netwerk/dns/src/nsHostResolver.cpp +++ b/netwerk/dns/src/nsHostResolver.cpp @@ -209,14 +209,14 @@ struct nsHostDBEnt : PLDHashEntryHdr nsHostRecord *rec; }; -PR_STATIC_CALLBACK(PLDHashNumber) +static PLDHashNumber HostDB_HashKey(PLDHashTable *table, const void *key) { const nsHostKey *hk = static_cast(key); return PL_DHashStringKey(table, hk->host) ^ hk->flags ^ hk->af; } -PR_STATIC_CALLBACK(PRBool) +static PRBool HostDB_MatchEntry(PLDHashTable *table, const PLDHashEntryHdr *entry, const void *key) @@ -229,7 +229,7 @@ HostDB_MatchEntry(PLDHashTable *table, he->rec->af == hk->af; } -PR_STATIC_CALLBACK(void) +static void HostDB_MoveEntry(PLDHashTable *table, const PLDHashEntryHdr *from, PLDHashEntryHdr *to) @@ -238,7 +238,7 @@ HostDB_MoveEntry(PLDHashTable *table, static_cast(from)->rec; } -PR_STATIC_CALLBACK(void) +static void HostDB_ClearEntry(PLDHashTable *table, PLDHashEntryHdr *entry) { @@ -268,7 +268,7 @@ HostDB_ClearEntry(PLDHashTable *table, NS_RELEASE(he->rec); } -PR_STATIC_CALLBACK(PRBool) +static PRBool HostDB_InitEntry(PLDHashTable *table, PLDHashEntryHdr *entry, const void *key) @@ -290,7 +290,7 @@ static PLDHashTableOps gHostDB_ops = HostDB_InitEntry, }; -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator HostDB_RemoveEntry(PLDHashTable *table, PLDHashEntryHdr *hdr, PRUint32 number, @@ -676,7 +676,7 @@ nsHostResolver::OnLookupComplete(nsHostRecord *rec, nsresult status, PRAddrInfo //---------------------------------------------------------------------------- -void PR_CALLBACK +void nsHostResolver::ThreadFunc(void *arg) { LOG(("nsHostResolver::ThreadFunc entering\n")); diff --git a/netwerk/dns/src/nsHostResolver.h b/netwerk/dns/src/nsHostResolver.h index 366ef00798c0..714829786b6f 100644 --- a/netwerk/dns/src/nsHostResolver.h +++ b/netwerk/dns/src/nsHostResolver.h @@ -221,7 +221,7 @@ private: PRBool GetHostToLookup(nsHostRecord **); void OnLookupComplete(nsHostRecord *, nsresult, PRAddrInfo *); - PR_STATIC_CALLBACK(void) ThreadFunc(void *); + static void ThreadFunc(void *); PRUint32 mMaxCacheEntries; PRUint32 mMaxCacheLifetime; diff --git a/netwerk/protocol/http/src/nsHttp.cpp b/netwerk/protocol/http/src/nsHttp.cpp index 8be76fa13dc2..1313002fd18c 100644 --- a/netwerk/protocol/http/src/nsHttp.cpp +++ b/netwerk/protocol/http/src/nsHttp.cpp @@ -91,7 +91,7 @@ NewHeapAtom(const char *value) { } // Hash string ignore case, based on PL_HashString -PR_STATIC_CALLBACK(PLDHashNumber) +static PLDHashNumber StringHash(PLDHashTable *table, const void *key) { PLDHashNumber h = 0; @@ -100,7 +100,7 @@ StringHash(PLDHashTable *table, const void *key) return h; } -PR_STATIC_CALLBACK(PRBool) +static PRBool StringCompare(PLDHashTable *table, const PLDHashEntryHdr *entry, const void *testKey) { diff --git a/netwerk/protocol/http/src/nsHttpAuthCache.h b/netwerk/protocol/http/src/nsHttpAuthCache.h index e1784cfd774e..b308d8def802 100644 --- a/netwerk/protocol/http/src/nsHttpAuthCache.h +++ b/netwerk/protocol/http/src/nsHttpAuthCache.h @@ -253,10 +253,10 @@ private: nsCString &key); // hash table allocation functions - static void* PR_CALLBACK AllocTable(void *, PRSize size); - static void PR_CALLBACK FreeTable(void *, void *item); - static PLHashEntry* PR_CALLBACK AllocEntry(void *, const void *key); - static void PR_CALLBACK FreeEntry(void *, PLHashEntry *he, PRUintn flag); + static void* AllocTable(void *, PRSize size); + static void FreeTable(void *, void *item); + static PLHashEntry* AllocEntry(void *, const void *key); + static void FreeEntry(void *, PLHashEntry *he, PRUintn flag); static PLHashAllocOps gHashAllocOps; diff --git a/netwerk/protocol/http/src/nsHttpChannel.cpp b/netwerk/protocol/http/src/nsHttpChannel.cpp index 4c261ecd7b5e..4f92d9b56005 100644 --- a/netwerk/protocol/http/src/nsHttpChannel.cpp +++ b/netwerk/protocol/http/src/nsHttpChannel.cpp @@ -2530,7 +2530,7 @@ nsHttpChannel::ClearBogusContentEncodingIfNeeded() // nsHttpChannel //----------------------------------------------------------------------------- -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator CopyProperties(const nsAString& aKey, nsIVariant *aData, void *aClosure) { nsIWritablePropertyBag* bag = static_cast diff --git a/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp b/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp index c0262da49935..417379b160c9 100644 --- a/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp +++ b/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp @@ -293,7 +293,7 @@ nsHttpConnectionMgr::ProcessPendingQ(nsHttpConnectionInfo *ci) //----------------------------------------------------------------------------- // enumeration callbacks -PRIntn PR_CALLBACK +PRIntn nsHttpConnectionMgr::ProcessOneTransactionCB(nsHashKey *key, void *data, void *closure) { nsHttpConnectionMgr *self = (nsHttpConnectionMgr *) closure; @@ -305,7 +305,7 @@ nsHttpConnectionMgr::ProcessOneTransactionCB(nsHashKey *key, void *data, void *c return kHashEnumerateNext; } -PRIntn PR_CALLBACK +PRIntn nsHttpConnectionMgr::PurgeOneIdleConnectionCB(nsHashKey *key, void *data, void *closure) { nsHttpConnectionMgr *self = (nsHttpConnectionMgr *) closure; @@ -323,7 +323,7 @@ nsHttpConnectionMgr::PurgeOneIdleConnectionCB(nsHashKey *key, void *data, void * return kHashEnumerateNext; } -PRIntn PR_CALLBACK +PRIntn nsHttpConnectionMgr::PruneDeadConnectionsCB(nsHashKey *key, void *data, void *closure) { nsHttpConnectionMgr *self = (nsHttpConnectionMgr *) closure; @@ -371,7 +371,7 @@ nsHttpConnectionMgr::PruneDeadConnectionsCB(nsHashKey *key, void *data, void *cl return kHashEnumerateNext; } -PRIntn PR_CALLBACK +PRIntn nsHttpConnectionMgr::ShutdownPassCB(nsHashKey *key, void *data, void *closure) { nsHttpConnectionMgr *self = (nsHttpConnectionMgr *) closure; diff --git a/netwerk/protocol/http/src/nsHttpConnectionMgr.h b/netwerk/protocol/http/src/nsHttpConnectionMgr.h index 8a9f48d24f73..316f33f1a7ad 100644 --- a/netwerk/protocol/http/src/nsHttpConnectionMgr.h +++ b/netwerk/protocol/http/src/nsHttpConnectionMgr.h @@ -204,10 +204,10 @@ private: // NOTE: these members are only accessed on the socket transport thread //------------------------------------------------------------------------- - static PRIntn PR_CALLBACK ProcessOneTransactionCB(nsHashKey *, void *, void *); - static PRIntn PR_CALLBACK PurgeOneIdleConnectionCB(nsHashKey *, void *, void *); - static PRIntn PR_CALLBACK PruneDeadConnectionsCB(nsHashKey *, void *, void *); - static PRIntn PR_CALLBACK ShutdownPassCB(nsHashKey *, void *, void *); + static PRIntn ProcessOneTransactionCB(nsHashKey *, void *, void *); + static PRIntn PurgeOneIdleConnectionCB(nsHashKey *, void *, void *); + static PRIntn PruneDeadConnectionsCB(nsHashKey *, void *, void *); + static PRIntn ShutdownPassCB(nsHashKey *, void *, void *); PRBool ProcessPendingQForEntry(nsConnectionEntry *); PRBool AtActiveConnectionLimit(nsConnectionEntry *, PRUint8 caps); diff --git a/netwerk/socket/base/nsSOCKSIOLayer.cpp b/netwerk/socket/base/nsSOCKSIOLayer.cpp index 8e142611b2cc..48ab7ab9ab76 100644 --- a/netwerk/socket/base/nsSOCKSIOLayer.cpp +++ b/netwerk/socket/base/nsSOCKSIOLayer.cpp @@ -591,7 +591,7 @@ ConnectSOCKS4(PRFileDesc *fd, const PRNetAddr *addr, PRIntervalTime timeout) } -static PRStatus PR_CALLBACK +static PRStatus nsSOCKSIOLayerConnect(PRFileDesc *fd, const PRNetAddr *addr, PRIntervalTime /*timeout*/) { @@ -729,7 +729,7 @@ nsSOCKSIOLayerConnect(PRFileDesc *fd, const PRNetAddr *addr, PRIntervalTime /*ti return PR_SUCCESS; } -static PRStatus PR_CALLBACK +static PRStatus nsSOCKSIOLayerClose(PRFileDesc *fd) { nsSOCKSSocketInfo * info = (nsSOCKSSocketInfo*) fd->secret; @@ -744,28 +744,28 @@ nsSOCKSIOLayerClose(PRFileDesc *fd) return fd->lower->methods->close(fd->lower); } -static PRFileDesc* PR_CALLBACK +static PRFileDesc* nsSOCKSIOLayerAccept(PRFileDesc *fd, PRNetAddr *addr, PRIntervalTime timeout) { // TODO: implement SOCKS support for accept return fd->lower->methods->accept(fd->lower, addr, timeout); } -static PRInt32 PR_CALLBACK +static PRInt32 nsSOCKSIOLayerAcceptRead(PRFileDesc *sd, PRFileDesc **nd, PRNetAddr **raddr, void *buf, PRInt32 amount, PRIntervalTime timeout) { // TODO: implement SOCKS support for accept, then read from it return sd->lower->methods->acceptread(sd->lower, nd, raddr, buf, amount, timeout); } -static PRStatus PR_CALLBACK +static PRStatus nsSOCKSIOLayerBind(PRFileDesc *fd, const PRNetAddr *addr) { // TODO: implement SOCKS support for bind (very similar to connect) return fd->lower->methods->bind(fd->lower, addr); } -static PRStatus PR_CALLBACK +static PRStatus nsSOCKSIOLayerGetName(PRFileDesc *fd, PRNetAddr *addr) { nsSOCKSSocketInfo * info = (nsSOCKSSocketInfo*) fd->secret; @@ -778,7 +778,7 @@ nsSOCKSIOLayerGetName(PRFileDesc *fd, PRNetAddr *addr) return PR_FAILURE; } -static PRStatus PR_CALLBACK +static PRStatus nsSOCKSIOLayerGetPeerName(PRFileDesc *fd, PRNetAddr *addr) { nsSOCKSSocketInfo * info = (nsSOCKSSocketInfo*) fd->secret; @@ -791,7 +791,7 @@ nsSOCKSIOLayerGetPeerName(PRFileDesc *fd, PRNetAddr *addr) return PR_FAILURE; } -static PRStatus PR_CALLBACK +static PRStatus nsSOCKSIOLayerListen(PRFileDesc *fd, PRIntn backlog) { // TODO: implement SOCKS support for listen diff --git a/netwerk/streamconv/src/nsStreamConverterService.cpp b/netwerk/streamconv/src/nsStreamConverterService.cpp index 7c7d106fbb63..69760a246bca 100644 --- a/netwerk/streamconv/src/nsStreamConverterService.cpp +++ b/netwerk/streamconv/src/nsStreamConverterService.cpp @@ -85,7 +85,7 @@ nsStreamConverterService::~nsStreamConverterService() { } // Delete all the entries in the adjacency list -static PRBool PR_CALLBACK DeleteAdjacencyEntry(nsHashKey *aKey, void *aData, void* closure) { +static PRBool DeleteAdjacencyEntry(nsHashKey *aKey, void *aData, void* closure) { SCTableData *entry = (SCTableData*)aData; NS_ASSERTION(entry->key && entry->data.edges, "malformed adjacency list entry"); delete entry->key; @@ -259,7 +259,7 @@ nsStreamConverterService::ParseFromTo(const char *aContractID, nsCString &aFromR // nsObjectHashtable enumerator functions. // Initializes the BFS state table. -static PRBool PR_CALLBACK InitBFSTable(nsHashKey *aKey, void *aData, void* closure) { +static PRBool InitBFSTable(nsHashKey *aKey, void *aData, void* closure) { NS_ASSERTION((SCTableData*)aData, "no data in the table enumeration"); nsHashtable *BFSTable = (nsHashtable*)closure; @@ -284,7 +284,7 @@ static PRBool PR_CALLBACK InitBFSTable(nsHashKey *aKey, void *aData, void* closu } // cleans up the BFS state table -static PRBool PR_CALLBACK DeleteBFSEntry(nsHashKey *aKey, void *aData, void *closure) { +static PRBool DeleteBFSEntry(nsHashKey *aKey, void *aData, void *closure) { SCTableData *data = (SCTableData*)aData; BFSState *state = data->data.state; delete state; diff --git a/parser/htmlparser/src/nsExpatDriver.cpp b/parser/htmlparser/src/nsExpatDriver.cpp index c8598c675810..ecf8054acd9b 100644 --- a/parser/htmlparser/src/nsExpatDriver.cpp +++ b/parser/htmlparser/src/nsExpatDriver.cpp @@ -73,7 +73,7 @@ static PRLogModuleInfo *gExpatDriverLog = PR_NewLogModule("expatdriver"); /***************************** EXPAT CALL BACKS ******************************/ // The callback handlers that get called from the expat parser. -PR_STATIC_CALLBACK(void) +static void Driver_HandleXMLDeclaration(void *aUserData, const XML_Char *aVersion, const XML_Char *aEncoding, @@ -86,7 +86,7 @@ Driver_HandleXMLDeclaration(void *aUserData, } } -PR_STATIC_CALLBACK(void) +static void Driver_HandleStartElement(void *aUserData, const XML_Char *aName, const XML_Char **aAtts) @@ -98,7 +98,7 @@ Driver_HandleStartElement(void *aUserData, } } -PR_STATIC_CALLBACK(void) +static void Driver_HandleEndElement(void *aUserData, const XML_Char *aName) { @@ -108,7 +108,7 @@ Driver_HandleEndElement(void *aUserData, } } -PR_STATIC_CALLBACK(void) +static void Driver_HandleCharacterData(void *aUserData, const XML_Char *aData, int aLength) @@ -120,7 +120,7 @@ Driver_HandleCharacterData(void *aUserData, } } -PR_STATIC_CALLBACK(void) +static void Driver_HandleComment(void *aUserData, const XML_Char *aName) { @@ -130,7 +130,7 @@ Driver_HandleComment(void *aUserData, } } -PR_STATIC_CALLBACK(void) +static void Driver_HandleProcessingInstruction(void *aUserData, const XML_Char *aTarget, const XML_Char *aData) @@ -142,7 +142,7 @@ Driver_HandleProcessingInstruction(void *aUserData, } } -PR_STATIC_CALLBACK(void) +static void Driver_HandleDefault(void *aUserData, const XML_Char *aData, int aLength) @@ -154,7 +154,7 @@ Driver_HandleDefault(void *aUserData, } } -PR_STATIC_CALLBACK(void) +static void Driver_HandleStartCdataSection(void *aUserData) { NS_ASSERTION(aUserData, "expat driver should exist"); @@ -163,7 +163,7 @@ Driver_HandleStartCdataSection(void *aUserData) } } -PR_STATIC_CALLBACK(void) +static void Driver_HandleEndCdataSection(void *aUserData) { NS_ASSERTION(aUserData, "expat driver should exist"); @@ -172,7 +172,7 @@ Driver_HandleEndCdataSection(void *aUserData) } } -PR_STATIC_CALLBACK(void) +static void Driver_HandleStartDoctypeDecl(void *aUserData, const XML_Char *aDoctypeName, const XML_Char *aSysid, @@ -186,7 +186,7 @@ Driver_HandleStartDoctypeDecl(void *aUserData, } } -PR_STATIC_CALLBACK(void) +static void Driver_HandleEndDoctypeDecl(void *aUserData) { NS_ASSERTION(aUserData, "expat driver should exist"); @@ -195,7 +195,7 @@ Driver_HandleEndDoctypeDecl(void *aUserData) } } -PR_STATIC_CALLBACK(int) +static int Driver_HandleExternalEntityRef(void *aExternalEntityRefHandler, const XML_Char *aOpenEntityNames, const XML_Char *aBase, @@ -214,7 +214,7 @@ Driver_HandleExternalEntityRef(void *aExternalEntityRefHandler, aPublicId); } -PR_STATIC_CALLBACK(void) +static void Driver_HandleStartNamespaceDecl(void *aUserData, const XML_Char *aPrefix, const XML_Char *aUri) @@ -226,7 +226,7 @@ Driver_HandleStartNamespaceDecl(void *aUserData, } } -PR_STATIC_CALLBACK(void) +static void Driver_HandleEndNamespaceDecl(void *aUserData, const XML_Char *aPrefix) { @@ -237,7 +237,7 @@ Driver_HandleEndNamespaceDecl(void *aUserData, } } -PR_STATIC_CALLBACK(void) +static void Driver_HandleNotationDecl(void *aUserData, const XML_Char *aNotationName, const XML_Char *aBase, @@ -251,7 +251,7 @@ Driver_HandleNotationDecl(void *aUserData, } } -PR_STATIC_CALLBACK(void) +static void Driver_HandleUnparsedEntityDecl(void *aUserData, const XML_Char *aEntityName, const XML_Char *aBase, diff --git a/parser/htmlparser/src/nsHTMLEntities.cpp b/parser/htmlparser/src/nsHTMLEntities.cpp index 460f3ec6f199..fe264a7c7579 100644 --- a/parser/htmlparser/src/nsHTMLEntities.cpp +++ b/parser/htmlparser/src/nsHTMLEntities.cpp @@ -54,7 +54,7 @@ struct EntityNodeEntry : public PLDHashEntryHdr const EntityNode* node; }; -PR_STATIC_CALLBACK(PRBool) +static PRBool matchNodeString(PLDHashTable*, const PLDHashEntryHdr* aHdr, const void* key) { @@ -63,7 +63,7 @@ PR_STATIC_CALLBACK(PRBool) return (nsCRT::strcmp(entry->node->mStr, str) == 0); } -PR_STATIC_CALLBACK(PRBool) +static PRBool matchNodeUnicode(PLDHashTable*, const PLDHashEntryHdr* aHdr, const void* key) { @@ -72,7 +72,7 @@ PR_STATIC_CALLBACK(PRBool) return (entry->node->mUnicode == ucode); } -PR_STATIC_CALLBACK(PLDHashNumber) +static PLDHashNumber hashUnicodeValue(PLDHashTable*, const void* key) { // key is actually the unicode value diff --git a/parser/htmlparser/src/nsHTMLTags.cpp b/parser/htmlparser/src/nsHTMLTags.cpp index 8487d71dad7f..12b448d69391 100644 --- a/parser/htmlparser/src/nsHTMLTags.cpp +++ b/parser/htmlparser/src/nsHTMLTags.cpp @@ -290,7 +290,7 @@ PLHashTable* nsHTMLTags::gTagAtomTable; // PRUnichar* -> id hash -PR_STATIC_CALLBACK(PLHashNumber) +static PLHashNumber HTMLTagsHashCodeUCPtr(const void *key) { const PRUnichar *str = (const PRUnichar *)key; @@ -298,7 +298,7 @@ HTMLTagsHashCodeUCPtr(const void *key) return nsCRT::HashCode(str); } -PR_STATIC_CALLBACK(PRIntn) +static PRIntn HTMLTagsKeyCompareUCPtr(const void *key1, const void *key2) { const PRUnichar *str1 = (const PRUnichar *)key1; @@ -308,7 +308,7 @@ HTMLTagsKeyCompareUCPtr(const void *key1, const void *key2) } // nsIAtom* -> id hash -PR_STATIC_CALLBACK(PLHashNumber) +static PLHashNumber HTMLTagsHashCodeAtom(const void *key) { return NS_PTR_TO_INT32(key) >> 2; diff --git a/parser/htmlparser/src/nsParserModule.cpp b/parser/htmlparser/src/nsParserModule.cpp index 17d23785037d..5a8a9817569e 100644 --- a/parser/htmlparser/src/nsParserModule.cpp +++ b/parser/htmlparser/src/nsParserModule.cpp @@ -116,7 +116,7 @@ static const nsModuleComponentInfo gComponents[] = { static PRBool gInitialized = PR_FALSE; -PR_STATIC_CALLBACK(nsresult) +static nsresult Initialize(nsIModule* aSelf) { if (!gInitialized) { @@ -142,7 +142,7 @@ Initialize(nsIModule* aSelf) return nsParser::Init(); } -PR_STATIC_CALLBACK(void) +static void Shutdown(nsIModule* aSelf) { if (gInitialized) { diff --git a/rdf/base/src/nsInMemoryDataSource.cpp b/rdf/base/src/nsInMemoryDataSource.cpp index b34d2040e1a9..9f2357506a52 100644 --- a/rdf/base/src/nsInMemoryDataSource.cpp +++ b/rdf/base/src/nsInMemoryDataSource.cpp @@ -145,7 +145,7 @@ public: aAssertion->~Assertion(); aAllocator.Free(aAssertion, sizeof(*aAssertion)); } - static PLDHashOperator PR_CALLBACK + static PLDHashOperator DeletePropertyHashEntry(PLDHashTable* aTable, PLDHashEntryHdr* aHdr, PRUint32 aNumber, void* aArg); @@ -276,7 +276,7 @@ Assertion::~Assertion() } } -PLDHashOperator PR_CALLBACK +PLDHashOperator Assertion::DeletePropertyHashEntry(PLDHashTable* aTable, PLDHashEntryHdr* aHdr, PRUint32 aNumber, void* aArg) { @@ -327,11 +327,11 @@ protected: // during mReadCount == 0 PRUint32 mReadCount; - static PLDHashOperator PR_CALLBACK + static PLDHashOperator DeleteForwardArcsEntry(PLDHashTable* aTable, PLDHashEntryHdr* aHdr, PRUint32 aNumber, void* aArg); - static PLDHashOperator PR_CALLBACK + static PLDHashOperator ResourceEnumerator(PLDHashTable* aTable, PLDHashEntryHdr* aHdr, PRUint32 aNumber, void* aArg); @@ -378,7 +378,7 @@ public: NS_DECL_RDFIDATASOURCE protected: - static PLDHashOperator PR_CALLBACK + static PLDHashOperator SweepForwardArcsEntries(PLDHashTable* aTable, PLDHashEntryHdr* aHdr, PRUint32 aNumber, void* aArg); @@ -661,7 +661,7 @@ private: virtual ~InMemoryArcsEnumeratorImpl(); - static PLDHashOperator PR_CALLBACK + static PLDHashOperator ArcEnumerator(PLDHashTable* aTable, PLDHashEntryHdr* aHdr, PRUint32 aNumber, void* aArg); @@ -695,7 +695,7 @@ public: }; -PLDHashOperator PR_CALLBACK +PLDHashOperator InMemoryArcsEnumeratorImpl::ArcEnumerator(PLDHashTable* aTable, PLDHashEntryHdr* aHdr, PRUint32 aNumber, void* aArg) @@ -964,7 +964,7 @@ InMemoryDataSource::~InMemoryDataSource() } -PLDHashOperator PR_CALLBACK +PLDHashOperator InMemoryDataSource::DeleteForwardArcsEntry(PLDHashTable* aTable, PLDHashEntryHdr* aHdr, PRUint32 aNumber, void* aArg) { @@ -1785,7 +1785,7 @@ InMemoryDataSource::ArcLabelsOut(nsIRDFResource* aSource, nsISimpleEnumerator** return NS_OK; } -PLDHashOperator PR_CALLBACK +PLDHashOperator InMemoryDataSource::ResourceEnumerator(PLDHashTable* aTable, PLDHashEntryHdr* aHdr, PRUint32 aNumber, void* aArg) @@ -2048,7 +2048,7 @@ InMemoryDataSource::Sweep() } -PLDHashOperator PR_CALLBACK +PLDHashOperator InMemoryDataSource::SweepForwardArcsEntries(PLDHashTable* aTable, PLDHashEntryHdr* aHdr, PRUint32 aNumber, void* aArg) @@ -2151,7 +2151,7 @@ public: nsresult mRv; }; -PLDHashOperator PR_CALLBACK +PLDHashOperator SubjectEnumerator(PLDHashTable* aTable, PLDHashEntryHdr* aHdr, PRUint32 aNumber, void* aArg) { Entry* entry = reinterpret_cast(aHdr); @@ -2193,7 +2193,7 @@ public: VisitorClosure* mOuter; }; -PLDHashOperator PR_CALLBACK +PLDHashOperator TriplesInnerEnumerator(PLDHashTable* aTable, PLDHashEntryHdr* aHdr, PRUint32 aNumber, void* aArg) { Entry* entry = reinterpret_cast(aHdr); @@ -2214,7 +2214,7 @@ TriplesInnerEnumerator(PLDHashTable* aTable, PLDHashEntryHdr* aHdr, } return PL_DHASH_NEXT; } -PLDHashOperator PR_CALLBACK +PLDHashOperator TriplesEnumerator(PLDHashTable* aTable, PLDHashEntryHdr* aHdr, PRUint32 aNumber, void* aArg) { Entry* entry = reinterpret_cast(aHdr); diff --git a/rdf/base/src/nsRDFService.cpp b/rdf/base/src/nsRDFService.cpp index 0f36417e0a05..e71e47519898 100644 --- a/rdf/base/src/nsRDFService.cpp +++ b/rdf/base/src/nsRDFService.cpp @@ -111,7 +111,7 @@ class BlobImpl; // change to free the key in DataSourceFreeEntry. // XXX sigh, why were DefaultAllocTable et. al. declared static, anyway? -static void * PR_CALLBACK +static void * DataSourceAllocTable(void *pool, PRSize size) { #if defined(XP_MAC) @@ -121,7 +121,7 @@ DataSourceAllocTable(void *pool, PRSize size) return PR_MALLOC(size); } -static void PR_CALLBACK +static void DataSourceFreeTable(void *pool, void *item) { #if defined(XP_MAC) @@ -131,7 +131,7 @@ DataSourceFreeTable(void *pool, void *item) PR_Free(item); } -static PLHashEntry * PR_CALLBACK +static PLHashEntry * DataSourceAllocEntry(void *pool, const void *key) { #if defined(XP_MAC) @@ -141,7 +141,7 @@ DataSourceAllocEntry(void *pool, const void *key) return PR_NEW(PLHashEntry); } -static void PR_CALLBACK +static void DataSourceFreeEntry(void *pool, PLHashEntry *he, PRUintn flag) { #if defined(XP_MAC) @@ -168,13 +168,13 @@ struct ResourceHashEntry : public PLDHashEntryHdr { const char *mKey; nsIRDFResource *mResource; - static PLDHashNumber PR_CALLBACK + static PLDHashNumber HashKey(PLDHashTable *table, const void *key) { return nsCRT::HashCode(static_cast(key)); } - static PRBool PR_CALLBACK + static PRBool MatchEntry(PLDHashTable *table, const PLDHashEntryHdr *hdr, const void *key) { @@ -206,13 +206,13 @@ struct LiteralHashEntry : public PLDHashEntryHdr { nsIRDFLiteral *mLiteral; const PRUnichar *mKey; - static PLDHashNumber PR_CALLBACK + static PLDHashNumber HashKey(PLDHashTable *table, const void *key) { return nsCRT::HashCode(static_cast(key)); } - static PRBool PR_CALLBACK + static PRBool MatchEntry(PLDHashTable *table, const PLDHashEntryHdr *hdr, const void *key) { @@ -244,13 +244,13 @@ struct IntHashEntry : public PLDHashEntryHdr { nsIRDFInt *mInt; PRInt32 mKey; - static PLDHashNumber PR_CALLBACK + static PLDHashNumber HashKey(PLDHashTable *table, const void *key) { return PLDHashNumber(*static_cast(key)); } - static PRBool PR_CALLBACK + static PRBool MatchEntry(PLDHashTable *table, const PLDHashEntryHdr *hdr, const void *key) { @@ -281,7 +281,7 @@ struct DateHashEntry : public PLDHashEntryHdr { nsIRDFDate *mDate; PRTime mKey; - static PLDHashNumber PR_CALLBACK + static PLDHashNumber HashKey(PLDHashTable *table, const void *key) { // xor the low 32 bits with the high 32 bits. @@ -296,7 +296,7 @@ struct DateHashEntry : public PLDHashEntryHdr { return PLDHashNumber(l32 ^ h32); } - static PRBool PR_CALLBACK + static PRBool MatchEntry(PLDHashTable *table, const PLDHashEntryHdr *hdr, const void *key) { @@ -400,7 +400,7 @@ BlobImpl::GetLength(PRInt32 *aResult) struct BlobHashEntry : public PLDHashEntryHdr { BlobImpl *mBlob; - static PLDHashNumber PR_CALLBACK + static PLDHashNumber HashKey(PLDHashTable *table, const void *key) { const BlobImpl::Data *data = @@ -413,7 +413,7 @@ struct BlobHashEntry : public PLDHashEntryHdr { return h; } - static PRBool PR_CALLBACK + static PRBool MatchEntry(PLDHashTable *table, const PLDHashEntryHdr *hdr, const void *key) { diff --git a/testing/mochitest/ssltunnel/ssltunnel.cpp b/testing/mochitest/ssltunnel/ssltunnel.cpp index af663cdde39e..eab2c5cdabeb 100644 --- a/testing/mochitest/ssltunnel/ssltunnel.cpp +++ b/testing/mochitest/ssltunnel/ssltunnel.cpp @@ -225,7 +225,7 @@ bool ConnectSocket(PRFileDesc *fd, const PRNetAddr *addr, PRIntervalTime timeout * The data parameter is a connection_info_t*, and must be deleted * by this function. */ -void PR_CALLBACK HandleConnection(void* data) +void HandleConnection(void* data) { connection_info_t* ci = static_cast(data); PRIntervalTime connect_timeout = PR_SecondsToInterval(2); @@ -433,7 +433,7 @@ void PR_CALLBACK HandleConnection(void* data) * The data parameter is a server_info_t*, owned by the calling * function. */ -void PR_CALLBACK StartServer(void* data) +void StartServer(void* data) { server_info_t* si = static_cast(data); @@ -642,7 +642,7 @@ int parseConfigFile(const char* filePath) return 0; } -PRIntn PR_CALLBACK freeHashItems(PLHashEntry *he, PRIntn i, void *arg) +PRIntn freeHashItems(PLHashEntry *he, PRIntn i, void *arg) { delete [] (char*)he->key; delete [] (char*)he->value; diff --git a/toolkit/components/filepicker/src/nsFileView.cpp b/toolkit/components/filepicker/src/nsFileView.cpp index 5bdabc326ba0..4f20f8db9dce 100644 --- a/toolkit/components/filepicker/src/nsFileView.cpp +++ b/toolkit/components/filepicker/src/nsFileView.cpp @@ -894,7 +894,7 @@ nsFileView::ReverseArray(nsISupportsArray* aArray) } } -PR_STATIC_CALLBACK(int) +static int SortNameCallback(const void* aElement1, const void* aElement2, void* aContext) { nsIFile* file1 = *static_cast(aElement1); @@ -907,7 +907,7 @@ SortNameCallback(const void* aElement1, const void* aElement2, void* aContext) return Compare(leafName1, leafName2); } -PR_STATIC_CALLBACK(int) +static int SortSizeCallback(const void* aElement1, const void* aElement2, void* aContext) { nsIFile* file1 = *static_cast(aElement1); @@ -923,7 +923,7 @@ SortSizeCallback(const void* aElement1, const void* aElement2, void* aContext) return (LL_CMP(size1, <, size2) ? -1 : 1); } -PR_STATIC_CALLBACK(int) +static int SortDateCallback(const void* aElement1, const void* aElement2, void* aContext) { nsIFile* file1 = *static_cast(aElement1); diff --git a/toolkit/components/places/src/nsFaviconService.cpp b/toolkit/components/places/src/nsFaviconService.cpp index def447f615a7..26fb0b1c1905 100644 --- a/toolkit/components/places/src/nsFaviconService.cpp +++ b/toolkit/components/places/src/nsFaviconService.cpp @@ -842,7 +842,7 @@ nsFaviconService::GetFaviconLinkForIcon(nsIURI* aFaviconURI, // nsFaviconService::AddFailedFavicon -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator ExpireFailedFaviconsCallback(nsCStringHashKey::KeyType aKey, PRUint32& aData, void* userArg) diff --git a/toolkit/components/places/src/nsMorkHistoryImporter.cpp b/toolkit/components/places/src/nsMorkHistoryImporter.cpp index 5102b71141e4..3c210094bd80 100644 --- a/toolkit/components/places/src/nsMorkHistoryImporter.cpp +++ b/toolkit/components/places/src/nsMorkHistoryImporter.cpp @@ -94,7 +94,7 @@ SwapBytes(PRUnichar *buffer) } // Enumerator callback to add a table row to history -static PLDHashOperator PR_CALLBACK +static PLDHashOperator AddToHistoryCB(const nsCSubstring &aRowID, const nsTArray *aValues, void *aData) diff --git a/toolkit/components/places/src/nsNavBookmarks.cpp b/toolkit/components/places/src/nsNavBookmarks.cpp index cef7a54b7e00..33434ad27d78 100644 --- a/toolkit/components/places/src/nsNavBookmarks.cpp +++ b/toolkit/components/places/src/nsNavBookmarks.cpp @@ -742,7 +742,7 @@ nsNavBookmarks::RecursiveAddBookmarkHash(PRInt64 aPlaceID, // an Int64 history page ID) as the userArg and removes all redirect // destinations that reference it. -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator RemoveBookmarkHashCallback(nsTrimInt64HashKey::KeyType aKey, PRInt64& aPlaceId, void* aUserArg) { diff --git a/toolkit/components/places/src/nsNavHistory.cpp b/toolkit/components/places/src/nsNavHistory.cpp index 58b6e3631015..10cd7ead7f03 100644 --- a/toolkit/components/places/src/nsNavHistory.cpp +++ b/toolkit/components/places/src/nsNavHistory.cpp @@ -4546,7 +4546,7 @@ nsNavHistory::SetURIGeckoFlags(nsIURI* aURI, PRUint32 aFlags) // is visited. See GetRedirectFor for more information // this is the expiration callback function that deletes stale entries -PLDHashOperator PR_CALLBACK nsNavHistory::ExpireNonrecentRedirects( +PLDHashOperator nsNavHistory::ExpireNonrecentRedirects( nsCStringHashKey::KeyType aKey, RedirectInfo& aData, void* aUserArg) { PRInt64* threshold = reinterpret_cast(aUserArg); @@ -5475,7 +5475,7 @@ nsNavHistory::CheckIsRecentEvent(RecentEventHash* hashTable, // // This goes through our -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator ExpireNonrecentEventsCallback(nsCStringHashKey::KeyType aKey, PRInt64& aData, void* userArg) diff --git a/toolkit/components/places/src/nsNavHistory.h b/toolkit/components/places/src/nsNavHistory.h index b657a86e8ff3..c1aa15edd660 100644 --- a/toolkit/components/places/src/nsNavHistory.h +++ b/toolkit/components/places/src/nsNavHistory.h @@ -628,7 +628,7 @@ protected: }; typedef nsDataHashtable RedirectHash; RedirectHash mRecentRedirects; - PR_STATIC_CALLBACK(PLDHashOperator) ExpireNonrecentRedirects( + static PLDHashOperator ExpireNonrecentRedirects( nsCStringHashKey::KeyType aKey, RedirectInfo& aData, void* aUserArg); PRBool GetRedirectFor(const nsACString& aDestination, nsACString& aSource, PRTime* aTime, PRUint32* aRedirectType); diff --git a/toolkit/components/places/src/nsNavHistoryResult.cpp b/toolkit/components/places/src/nsNavHistoryResult.cpp index 5ea82566ebab..95d56e901bee 100644 --- a/toolkit/components/places/src/nsNavHistoryResult.cpp +++ b/toolkit/components/places/src/nsNavHistoryResult.cpp @@ -841,7 +841,7 @@ PRInt32 nsNavHistoryContainerResultNode::SortComparison_StringLess( // need to worry about tiebreaking. When there are no bookmark indices, // everything will be -1 and we don't worry about sorting. -PRInt32 PR_CALLBACK nsNavHistoryContainerResultNode::SortComparison_Bookmark( +PRInt32 nsNavHistoryContainerResultNode::SortComparison_Bookmark( nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure) { return a->mBookmarkIndex - b->mBookmarkIndex; @@ -856,7 +856,7 @@ PRInt32 PR_CALLBACK nsNavHistoryContainerResultNode::SortComparison_Bookmark( // // The collation object must be allocated before sorting on title! -PRInt32 PR_CALLBACK nsNavHistoryContainerResultNode::SortComparison_TitleLess( +PRInt32 nsNavHistoryContainerResultNode::SortComparison_TitleLess( nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure) { PRUint32 aType; @@ -878,7 +878,7 @@ PRInt32 PR_CALLBACK nsNavHistoryContainerResultNode::SortComparison_TitleLess( } return value; } -PRInt32 PR_CALLBACK nsNavHistoryContainerResultNode::SortComparison_TitleGreater( +PRInt32 nsNavHistoryContainerResultNode::SortComparison_TitleGreater( nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure) { return -SortComparison_TitleLess(a, b, closure); @@ -889,7 +889,7 @@ PRInt32 PR_CALLBACK nsNavHistoryContainerResultNode::SortComparison_TitleGreater // Equal times will be very unusual, but it is important that there is some // deterministic ordering of the results so they don't move around. -PRInt32 PR_CALLBACK nsNavHistoryContainerResultNode::SortComparison_DateLess( +PRInt32 nsNavHistoryContainerResultNode::SortComparison_DateLess( nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure) { PRInt32 value = ComparePRTime(a->mTime, b->mTime); @@ -901,7 +901,7 @@ PRInt32 PR_CALLBACK nsNavHistoryContainerResultNode::SortComparison_DateLess( } return value; } -PRInt32 PR_CALLBACK nsNavHistoryContainerResultNode::SortComparison_DateGreater( +PRInt32 nsNavHistoryContainerResultNode::SortComparison_DateGreater( nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure) { return -nsNavHistoryContainerResultNode::SortComparison_DateLess(a, b, closure); @@ -910,7 +910,7 @@ PRInt32 PR_CALLBACK nsNavHistoryContainerResultNode::SortComparison_DateGreater( // nsNavHistoryContainerResultNode::SortComparison_DateAdded* // -PRInt32 PR_CALLBACK nsNavHistoryContainerResultNode::SortComparison_DateAddedLess( +PRInt32 nsNavHistoryContainerResultNode::SortComparison_DateAddedLess( nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure) { PRInt32 value = ComparePRTime(a->mDateAdded, b->mDateAdded); @@ -922,7 +922,7 @@ PRInt32 PR_CALLBACK nsNavHistoryContainerResultNode::SortComparison_DateAddedLes } return value; } -PRInt32 PR_CALLBACK nsNavHistoryContainerResultNode::SortComparison_DateAddedGreater( +PRInt32 nsNavHistoryContainerResultNode::SortComparison_DateAddedGreater( nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure) { return -nsNavHistoryContainerResultNode::SortComparison_DateAddedLess(a, b, closure); @@ -932,7 +932,7 @@ PRInt32 PR_CALLBACK nsNavHistoryContainerResultNode::SortComparison_DateAddedGre // nsNavHistoryContainerResultNode::SortComparison_LastModified* // -PRInt32 PR_CALLBACK nsNavHistoryContainerResultNode::SortComparison_LastModifiedLess( +PRInt32 nsNavHistoryContainerResultNode::SortComparison_LastModifiedLess( nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure) { PRInt32 value = ComparePRTime(a->mLastModified, b->mLastModified); @@ -944,7 +944,7 @@ PRInt32 PR_CALLBACK nsNavHistoryContainerResultNode::SortComparison_LastModified } return value; } -PRInt32 PR_CALLBACK nsNavHistoryContainerResultNode::SortComparison_LastModifiedGreater( +PRInt32 nsNavHistoryContainerResultNode::SortComparison_LastModifiedGreater( nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure) { return -nsNavHistoryContainerResultNode::SortComparison_LastModifiedLess(a, b, closure); @@ -955,7 +955,7 @@ PRInt32 PR_CALLBACK nsNavHistoryContainerResultNode::SortComparison_LastModified // Certain types of parent nodes are treated specially because URIs are not // valid (like days or hosts). -PRInt32 PR_CALLBACK nsNavHistoryContainerResultNode::SortComparison_URILess( +PRInt32 nsNavHistoryContainerResultNode::SortComparison_URILess( nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure) { PRInt32 value; @@ -975,14 +975,14 @@ PRInt32 PR_CALLBACK nsNavHistoryContainerResultNode::SortComparison_URILess( } return value; } -PRInt32 PR_CALLBACK nsNavHistoryContainerResultNode::SortComparison_URIGreater( +PRInt32 nsNavHistoryContainerResultNode::SortComparison_URIGreater( nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure) { return -SortComparison_URILess(a, b, closure); } // nsNavHistoryContainerResultNode::SortComparison_Keyword* -PRInt32 PR_CALLBACK nsNavHistoryContainerResultNode::SortComparison_KeywordLess( +PRInt32 nsNavHistoryContainerResultNode::SortComparison_KeywordLess( nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure) { PRInt32 value = 0; @@ -1012,13 +1012,13 @@ PRInt32 PR_CALLBACK nsNavHistoryContainerResultNode::SortComparison_KeywordLess( return value; } -PRInt32 PR_CALLBACK nsNavHistoryContainerResultNode::SortComparison_KeywordGreater( +PRInt32 nsNavHistoryContainerResultNode::SortComparison_KeywordGreater( nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure) { return -SortComparison_KeywordLess(a, b, closure); } -PRInt32 PR_CALLBACK nsNavHistoryContainerResultNode::SortComparison_AnnotationLess( +PRInt32 nsNavHistoryContainerResultNode::SortComparison_AnnotationLess( nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure) { nsCAutoString annoName(static_cast(closure)); @@ -1156,7 +1156,7 @@ PRInt32 PR_CALLBACK nsNavHistoryContainerResultNode::SortComparison_AnnotationLe return value; } -PRInt32 PR_CALLBACK nsNavHistoryContainerResultNode::SortComparison_AnnotationGreater( +PRInt32 nsNavHistoryContainerResultNode::SortComparison_AnnotationGreater( nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure) { return -SortComparison_AnnotationLess(a, b, closure); @@ -1166,7 +1166,7 @@ PRInt32 PR_CALLBACK nsNavHistoryContainerResultNode::SortComparison_AnnotationGr // // Fall back on dates for conflict resolution -PRInt32 PR_CALLBACK nsNavHistoryContainerResultNode::SortComparison_VisitCountLess( +PRInt32 nsNavHistoryContainerResultNode::SortComparison_VisitCountLess( nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure) { PRInt32 value = CompareIntegers(a->mAccessCount, b->mAccessCount); @@ -1177,7 +1177,7 @@ PRInt32 PR_CALLBACK nsNavHistoryContainerResultNode::SortComparison_VisitCountLe } return value; } -PRInt32 PR_CALLBACK nsNavHistoryContainerResultNode::SortComparison_VisitCountGreater( +PRInt32 nsNavHistoryContainerResultNode::SortComparison_VisitCountGreater( nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure) { return -nsNavHistoryContainerResultNode::SortComparison_VisitCountLess(a, b, closure); @@ -1185,7 +1185,7 @@ PRInt32 PR_CALLBACK nsNavHistoryContainerResultNode::SortComparison_VisitCountGr // nsNavHistoryContainerResultNode::SortComparison_Tags* -PRInt32 PR_CALLBACK nsNavHistoryContainerResultNode::SortComparison_TagsLess( +PRInt32 nsNavHistoryContainerResultNode::SortComparison_TagsLess( nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure) { PRInt32 value = 0; @@ -1206,7 +1206,7 @@ PRInt32 PR_CALLBACK nsNavHistoryContainerResultNode::SortComparison_TagsLess( return value; } -PRInt32 PR_CALLBACK nsNavHistoryContainerResultNode::SortComparison_TagsGreater( +PRInt32 nsNavHistoryContainerResultNode::SortComparison_TagsGreater( nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure) { return -SortComparison_TagsLess(a, b, closure); @@ -1700,7 +1700,7 @@ nsNavHistoryContainerResultNode::UpdateURIs(PRBool aRecursive, PRBool aOnlyOne, // should be sure to set recursive to false, since child folders will have // their own callbacks registered. -static void PR_CALLBACK setTitleCallback( +static void setTitleCallback( nsNavHistoryResultNode* aNode, void* aClosure) { const nsACString* newTitle = reinterpret_cast(aClosure); @@ -2804,7 +2804,7 @@ nsNavHistoryQueryResultNode::OnClearHistory() // nsNavHistoryQueryResultNode::OnPageChanged // -static void PR_CALLBACK setFaviconCallback( +static void setFaviconCallback( nsNavHistoryResultNode* aNode, void* aClosure) { const nsCString* newFavicon = static_cast(aClosure); @@ -3691,7 +3691,7 @@ nsNavHistorySeparatorResultNode::nsNavHistorySeparatorResultNode() // nsNavHistoryResult ********************************************************** NS_IMPL_CYCLE_COLLECTION_CLASS(nsNavHistoryResult) -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator RemoveBookmarkFolderObserversCallback(nsTrimInt64HashKey::KeyType aKey, nsNavHistoryResult::FolderObserverList*& aData, void* userArg) @@ -3706,7 +3706,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsNavHistoryResult) tmp->mBookmarkFolderObservers.Enumerate(&RemoveBookmarkFolderObserversCallback, nsnull); NS_IMPL_CYCLE_COLLECTION_UNLINK_END -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator TraverseBookmarkFolderObservers(nsTrimInt64HashKey::KeyType aKey, nsNavHistoryResult::FolderObserverList*& aData, void* aUserArg) diff --git a/toolkit/components/places/src/nsNavHistoryResult.h b/toolkit/components/places/src/nsNavHistoryResult.h index 328f52023bfc..bb352285ea53 100644 --- a/toolkit/components/places/src/nsNavHistoryResult.h +++ b/toolkit/components/places/src/nsNavHistoryResult.h @@ -589,43 +589,43 @@ public: static PRInt32 SortComparison_StringLess(const nsAString& a, const nsAString& b); - PR_STATIC_CALLBACK(int) SortComparison_Bookmark( + static int SortComparison_Bookmark( nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure); - PR_STATIC_CALLBACK(int) SortComparison_TitleLess( + static int SortComparison_TitleLess( nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure); - PR_STATIC_CALLBACK(int) SortComparison_TitleGreater( + static int SortComparison_TitleGreater( nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure); - PR_STATIC_CALLBACK(int) SortComparison_DateLess( + static int SortComparison_DateLess( nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure); - PR_STATIC_CALLBACK(int) SortComparison_DateGreater( + static int SortComparison_DateGreater( nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure); - PR_STATIC_CALLBACK(int) SortComparison_URILess( + static int SortComparison_URILess( nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure); - PR_STATIC_CALLBACK(int) SortComparison_URIGreater( + static int SortComparison_URIGreater( nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure); - PR_STATIC_CALLBACK(int) SortComparison_VisitCountLess( + static int SortComparison_VisitCountLess( nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure); - PR_STATIC_CALLBACK(int) SortComparison_VisitCountGreater( + static int SortComparison_VisitCountGreater( nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure); - PR_STATIC_CALLBACK(int) SortComparison_KeywordLess( + static int SortComparison_KeywordLess( nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure); - PR_STATIC_CALLBACK(int) SortComparison_KeywordGreater( + static int SortComparison_KeywordGreater( nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure); - PR_STATIC_CALLBACK(int) SortComparison_AnnotationLess( + static int SortComparison_AnnotationLess( nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure); - PR_STATIC_CALLBACK(int) SortComparison_AnnotationGreater( + static int SortComparison_AnnotationGreater( nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure); - PR_STATIC_CALLBACK(int) SortComparison_DateAddedLess( + static int SortComparison_DateAddedLess( nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure); - PR_STATIC_CALLBACK(int) SortComparison_DateAddedGreater( + static int SortComparison_DateAddedGreater( nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure); - PR_STATIC_CALLBACK(int) SortComparison_LastModifiedLess( + static int SortComparison_LastModifiedLess( nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure); - PR_STATIC_CALLBACK(int) SortComparison_LastModifiedGreater( + static int SortComparison_LastModifiedGreater( nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure); - PR_STATIC_CALLBACK(int) SortComparison_TagsLess( + static int SortComparison_TagsLess( nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure); - PR_STATIC_CALLBACK(int) SortComparison_TagsGreater( + static int SortComparison_TagsGreater( nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure); // finding children: THESE DO NOT ADDREF diff --git a/toolkit/components/satchel/src/nsFormFillController.cpp b/toolkit/components/satchel/src/nsFormFillController.cpp index 5ed05c460a35..be6403bfea37 100644 --- a/toolkit/components/satchel/src/nsFormFillController.cpp +++ b/toolkit/components/satchel/src/nsFormFillController.cpp @@ -571,7 +571,7 @@ nsFormFillController::HandleEvent(nsIDOMEvent* aEvent) } -/* static */ PLDHashOperator PR_CALLBACK +/* static */ PLDHashOperator nsFormFillController::RemoveForDOMDocumentEnumerator(nsISupports* aKey, PRInt32& aEntry, void* aUserData) diff --git a/toolkit/components/satchel/src/nsFormFillController.h b/toolkit/components/satchel/src/nsFormFillController.h index 4ae5816cfb01..93437829cf86 100644 --- a/toolkit/components/satchel/src/nsFormFillController.h +++ b/toolkit/components/satchel/src/nsFormFillController.h @@ -129,9 +129,9 @@ protected: inline nsIDOMWindow *GetWindowForDocShell(nsIDocShell *aDocShell); inline PRInt32 GetIndexOfDocShell(nsIDocShell *aDocShell); - static PLDHashOperator PR_CALLBACK RemoveForDOMDocumentEnumerator(nsISupports* aKey, - PRInt32& aEntry, - void* aUserData); + static PLDHashOperator RemoveForDOMDocumentEnumerator(nsISupports* aKey, + PRInt32& aEntry, + void* aUserData); // members ////////////////////////////////////////// nsCOMPtr mController; diff --git a/toolkit/components/satchel/src/nsFormHistory.cpp b/toolkit/components/satchel/src/nsFormHistory.cpp index 9d038a89cb74..29f622598c62 100644 --- a/toolkit/components/satchel/src/nsFormHistory.cpp +++ b/toolkit/components/satchel/src/nsFormHistory.cpp @@ -803,7 +803,7 @@ nsFormHistory::AutoCompleteSearch(const nsAString &aInputName, return NS_OK; } -int PR_CALLBACK +int nsFormHistory::SortComparison(const void *v1, const void *v2, void *closureVoid) { PRUint32 *index1 = (PRUint32 *)v1; diff --git a/toolkit/components/satchel/src/nsFormHistory.h b/toolkit/components/satchel/src/nsFormHistory.h index f49bba916216..2addf6ab0945 100644 --- a/toolkit/components/satchel/src/nsFormHistory.h +++ b/toolkit/components/satchel/src/nsFormHistory.h @@ -99,7 +99,7 @@ protected: PRBool RowMatch(nsIMdbRow *aRow, const nsAString &aInputName, const nsAString &aInputValue, PRUnichar **aValue); - PR_STATIC_CALLBACK(int) SortComparison(const void *v1, const void *v2, void *closureVoid); + static int SortComparison(const void *v1, const void *v2, void *closureVoid); nsresult EntriesExistInternal(const nsAString *aName, const nsAString *aValue, PRBool *_retval); diff --git a/toolkit/components/satchel/src/nsStorageFormHistory.cpp b/toolkit/components/satchel/src/nsStorageFormHistory.cpp index 26ac9e525338..1f83df73d789 100644 --- a/toolkit/components/satchel/src/nsStorageFormHistory.cpp +++ b/toolkit/components/satchel/src/nsStorageFormHistory.cpp @@ -700,7 +700,7 @@ static void SwapBytes(PRUnichar* aBuffer) } // Enumerator callback to add an entry to the FormHistory -/* static */ PLDHashOperator PR_CALLBACK +/* static */ PLDHashOperator nsFormHistoryImporter::AddToFormHistoryCB(const nsCSubstring &aRowID, const nsTArray *aValues, void *aData) diff --git a/toolkit/components/satchel/src/nsStorageFormHistory.h b/toolkit/components/satchel/src/nsStorageFormHistory.h index a516937b7815..2c5c5a88de09 100644 --- a/toolkit/components/satchel/src/nsStorageFormHistory.h +++ b/toolkit/components/satchel/src/nsStorageFormHistory.h @@ -146,7 +146,7 @@ public: private: // Enumerator callback to add a single row to the FormHistory. - static PLDHashOperator PR_CALLBACK + static PLDHashOperator AddToFormHistoryCB(const nsCSubstring &aRowID, const nsTArray *aValues, void *aData); diff --git a/toolkit/crashreporter/nsExceptionHandler.cpp b/toolkit/crashreporter/nsExceptionHandler.cpp index be4c5b91b158..d6e1105b595e 100755 --- a/toolkit/crashreporter/nsExceptionHandler.cpp +++ b/toolkit/crashreporter/nsExceptionHandler.cpp @@ -747,9 +747,9 @@ static PRBool DoFindInReadable(const nsACString& str, const nsACString& value) return FindInReadable(value, start, end); } -static PLDHashOperator PR_CALLBACK EnumerateEntries(const nsACString& key, - nsCString entry, - void* userData) +static PLDHashOperator EnumerateEntries(const nsACString& key, + nsCString entry, + void* userData) { crashReporterAPIData->Append(key + NS_LITERAL_CSTRING("=") + entry + NS_LITERAL_CSTRING("\n")); diff --git a/toolkit/xre/nsSigHandlers.cpp b/toolkit/xre/nsSigHandlers.cpp index d080ef095879..3b7a25c6a5d2 100644 --- a/toolkit/xre/nsSigHandlers.cpp +++ b/toolkit/xre/nsSigHandlers.cpp @@ -118,7 +118,7 @@ void abnormal_exit_handler(int signum) extern "C" { -PR_STATIC_CALLBACK(void) PrintStackFrame(void *aPC, void *aClosure) +static void PrintStackFrame(void *aPC, void *aClosure) { char buf[1024]; nsCodeAddressDetails details; diff --git a/toolkit/xre/nsUpdateDriver.cpp b/toolkit/xre/nsUpdateDriver.cpp index b5b45a06342c..76caa8b3c5fa 100644 --- a/toolkit/xre/nsUpdateDriver.cpp +++ b/toolkit/xre/nsUpdateDriver.cpp @@ -175,7 +175,7 @@ GetXULRunnerStubPath(const char* argv0, nsILocalFile* *aResult) } #endif /* XP_MACOSX */ -PR_STATIC_CALLBACK(int) +static int ScanDirComparator(nsIFile *a, nsIFile *b, void *unused) { // lexically compare the leaf names of these two files diff --git a/tools/trace-malloc/lib/nsTraceMalloc.c b/tools/trace-malloc/lib/nsTraceMalloc.c index 56d6eeeda1bc..4b7e587c69c8 100644 --- a/tools/trace-malloc/lib/nsTraceMalloc.c +++ b/tools/trace-malloc/lib/nsTraceMalloc.c @@ -234,7 +234,7 @@ static tm_thread main_thread; /* 0-initialization is correct */ /* FIXME (maybe): This is currently unused; we leak the thread-local data. */ #if 0 -PR_STATIC_CALLBACK(void) +static void free_tm_thread(void *priv) { tm_thread *t = (tm_thread*) priv; @@ -897,7 +897,7 @@ calltree(void **stack, size_t num_stack_entries, tm_thread *t) * Buffer the stack from top at low index to bottom at high, so that we can * reverse it in calltree. */ -PR_STATIC_CALLBACK(void) +static void stack_callback(void *pc, void *closure) { stack_buffer_info *info = (stack_buffer_info*) closure; diff --git a/uriloader/base/nsDocLoader.cpp b/uriloader/base/nsDocLoader.cpp index 6ceccc2108e9..18797338bc48 100644 --- a/uriloader/base/nsDocLoader.cpp +++ b/uriloader/base/nsDocLoader.cpp @@ -105,7 +105,7 @@ struct nsRequestInfo : public PLDHashEntryHdr }; -PR_STATIC_CALLBACK(PRBool) +static PRBool RequestInfoHashInitEntry(PLDHashTable *table, PLDHashEntryHdr *entry, const void *key) { @@ -1437,7 +1437,7 @@ nsRequestInfo * nsDocLoader::GetRequestInfo(nsIRequest *aRequest) // PLDHashTable enumeration callback that just removes every entry // from the hash. -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator RemoveInfoCallback(PLDHashTable *table, PLDHashEntryHdr *hdr, PRUint32 number, void *arg) { @@ -1456,7 +1456,7 @@ void nsDocLoader::ClearRequestInfoHash(void) } // PLDHashTable enumeration callback that calculates the max progress. -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator CalcMaxProgressCallback(PLDHashTable *table, PLDHashEntryHdr *hdr, PRUint32 number, void *arg) { diff --git a/view/src/nsView.cpp b/view/src/nsView.cpp index 2999eee03a21..2a5715518599 100644 --- a/view/src/nsView.cpp +++ b/view/src/nsView.cpp @@ -48,7 +48,7 @@ //mmptemp -static nsEventStatus PR_CALLBACK HandleEvent(nsGUIEvent *aEvent); +static nsEventStatus HandleEvent(nsGUIEvent *aEvent); //#define SHOW_VIEW_BORDERS @@ -155,7 +155,7 @@ static ViewWrapper* GetWrapperFor(nsIWidget* aWidget) // // Main events handler // -nsEventStatus PR_CALLBACK HandleEvent(nsGUIEvent *aEvent) +nsEventStatus HandleEvent(nsGUIEvent *aEvent) { //printf(" %d %d %d (%d,%d) \n", aEvent->widget, aEvent->widgetSupports, // aEvent->message, aEvent->point.x, aEvent->point.y); diff --git a/widget/public/nsIWidget.h b/widget/public/nsIWidget.h index 84edd0af3fef..2271da83f790 100644 --- a/widget/public/nsIWidget.h +++ b/widget/public/nsIWidget.h @@ -71,7 +71,7 @@ class nsIContent; * The return value determines whether or not the default action should take place. */ -typedef nsEventStatus (*PR_CALLBACK EVENT_CALLBACK)(nsGUIEvent *event); +typedef nsEventStatus (* EVENT_CALLBACK)(nsGUIEvent *event); /** * Flags for the getNativeData function. diff --git a/widget/src/gtk2/nsBidiKeyboard.cpp b/widget/src/gtk2/nsBidiKeyboard.cpp index 49943592e118..bc259a7740e2 100644 --- a/widget/src/gtk2/nsBidiKeyboard.cpp +++ b/widget/src/gtk2/nsBidiKeyboard.cpp @@ -45,7 +45,7 @@ static PRLibrary *gtklib = nsnull; -typedef gboolean (PR_CALLBACK *GdkKeymapHaveBidiLayoutsType)(GdkKeymap *keymap); +typedef gboolean (*GdkKeymapHaveBidiLayoutsType)(GdkKeymap *keymap); static GdkKeymapHaveBidiLayoutsType GdkKeymapHaveBidiLayouts = nsnull; diff --git a/widget/src/gtk2/nsSound.cpp b/widget/src/gtk2/nsSound.cpp index 44c9ae74c887..a7486b9834ca 100644 --- a/widget/src/gtk2/nsSound.cpp +++ b/widget/src/gtk2/nsSound.cpp @@ -71,17 +71,14 @@ static PRLibrary *elib = nsnull; #define WAV_MIN_LENGTH 44 -typedef int (PR_CALLBACK *EsdOpenSoundType)(const char *host); -typedef int (PR_CALLBACK *EsdCloseType)(int); +typedef int (*EsdOpenSoundType)(const char *host); +typedef int (*EsdCloseType)(int); /* used to play the sounds from the find symbol call */ -typedef int (PR_CALLBACK *EsdPlayStreamType) (int, - int, - const char *, - const char *); -typedef int (PR_CALLBACK *EsdAudioOpenType) (void); -typedef int (PR_CALLBACK *EsdAudioWriteType) (const void *, int); -typedef void (PR_CALLBACK *EsdAudioCloseType) (void); +typedef int (*EsdPlayStreamType) (int, int, const char *, const char *); +typedef int (*EsdAudioOpenType) (void); +typedef int (*EsdAudioWriteType) (const void *, int); +typedef void (*EsdAudioCloseType) (void); NS_IMPL_ISUPPORTS2(nsSound, nsISound, nsIStreamLoaderObserver) diff --git a/widget/src/gtk2/nsWidgetFactory.cpp b/widget/src/gtk2/nsWidgetFactory.cpp index 0fbb50c8f435..86df17bed608 100644 --- a/widget/src/gtk2/nsWidgetFactory.cpp +++ b/widget/src/gtk2/nsWidgetFactory.cpp @@ -346,7 +346,7 @@ static const nsModuleComponentInfo components[] = }; -PR_STATIC_CALLBACK(void) +static void nsWidgetGtk2ModuleDtor(nsIModule *aSelf) { nsFilePicker::Shutdown(); diff --git a/widget/src/os2/nsToolkit.cpp b/widget/src/os2/nsToolkit.cpp index 4170a5678763..141c7752868c 100644 --- a/widget/src/os2/nsToolkit.cpp +++ b/widget/src/os2/nsToolkit.cpp @@ -62,7 +62,7 @@ struct ThreadInitInfo { nsToolkit *toolkit; }; -void PR_CALLBACK RunPump(void* arg) +void RunPump(void* arg) { ThreadInitInfo *info = (ThreadInitInfo*)arg; ::PR_EnterMonitor(info->monitor); diff --git a/widget/src/os2/nsWidgetFactory.cpp b/widget/src/os2/nsWidgetFactory.cpp index 7c9c49d55369..618284dc1322 100644 --- a/widget/src/os2/nsWidgetFactory.cpp +++ b/widget/src/os2/nsWidgetFactory.cpp @@ -200,7 +200,7 @@ static const nsModuleComponentInfo components[] = nsIdleServiceOS2Constructor }, }; -PR_STATIC_CALLBACK(void) +static void nsWidgetOS2ModuleDtor(nsIModule *self) { nsWindow::ReleaseGlobals(); diff --git a/widget/src/photon/nsWidgetFactory.cpp b/widget/src/photon/nsWidgetFactory.cpp index 232e6c60575a..e3cd700dfe41 100644 --- a/widget/src/photon/nsWidgetFactory.cpp +++ b/widget/src/photon/nsWidgetFactory.cpp @@ -140,7 +140,7 @@ static nsModuleComponentInfo components[] = nsFilePickerConstructor }, }; -PR_STATIC_CALLBACK(void) +static void nsWidgetPhModuleDtor(nsIModule *self) { // nsPhIMEHelper::Shutdown(); diff --git a/widget/src/qt/nsSound.cpp b/widget/src/qt/nsSound.cpp index 92f04e8810eb..bbcfb2fa64a0 100644 --- a/widget/src/qt/nsSound.cpp +++ b/widget/src/qt/nsSound.cpp @@ -69,17 +69,14 @@ static PRLibrary *elib = nsnull; #define WAV_MIN_LENGTH 44 -typedef int (PR_CALLBACK *EsdOpenSoundType)(const char *host); -typedef int (PR_CALLBACK *EsdCloseType)(int); +typedef int (*EsdOpenSoundType)(const char *host); +typedef int (*EsdCloseType)(int); /* used to play the sounds from the find symbol call */ -typedef int (PR_CALLBACK *EsdPlayStreamType) (int, - int, - const char *, - const char *); -typedef int (PR_CALLBACK *EsdAudioOpenType) (void); -typedef int (PR_CALLBACK *EsdAudioWriteType) (const void *, int); -typedef void (PR_CALLBACK *EsdAudioCloseType) (void); +typedef int (*EsdPlayStreamType) (int, int, const char *, const char *); +typedef int (*EsdAudioOpenType) (void); +typedef int (*EsdAudioWriteType) (const void *, int); +typedef void (*EsdAudioCloseType) (void); NS_IMPL_ISUPPORTS2(nsSound, nsISound, nsIStreamLoaderObserver) diff --git a/widget/src/qt/nsWidgetFactory.cpp b/widget/src/qt/nsWidgetFactory.cpp index d7870f0a1934..182c16259bca 100644 --- a/widget/src/qt/nsWidgetFactory.cpp +++ b/widget/src/qt/nsWidgetFactory.cpp @@ -179,7 +179,7 @@ static const nsModuleComponentInfo components[] = }; -PR_STATIC_CALLBACK(void) +static void nsWidgetQtModuleDtor(nsIModule *aSelf) { nsSound::Shutdown(); diff --git a/widget/src/windows/nsKeyboardLayout.cpp b/widget/src/windows/nsKeyboardLayout.cpp index 562d11fb54ba..e896dea7e330 100644 --- a/widget/src/windows/nsKeyboardLayout.cpp +++ b/widget/src/windows/nsKeyboardLayout.cpp @@ -539,7 +539,7 @@ inline PRInt32 KeyboardLayout::GetKeyIndex (PRUint8 aVirtualKey) return xlat [aVirtualKey]; } -int PR_CALLBACK KeyboardLayout::CompareDeadKeyEntries (const void* aArg1, const void* aArg2, void*) +int KeyboardLayout::CompareDeadKeyEntries (const void* aArg1, const void* aArg2, void*) { const DeadKeyEntry* arg1 = static_cast(aArg1); const DeadKeyEntry* arg2 = static_cast(aArg2); diff --git a/widget/src/windows/nsKeyboardLayout.h b/widget/src/windows/nsKeyboardLayout.h index 401d37c4199a..3655497b51e4 100644 --- a/widget/src/windows/nsKeyboardLayout.h +++ b/widget/src/windows/nsKeyboardLayout.h @@ -151,7 +151,7 @@ class KeyboardLayout static PRUint8 GetShiftState (const PBYTE aKbdState); static void SetShiftState (PBYTE aKbdState, PRUint8 aShiftState); static inline PRInt32 GetKeyIndex (PRUint8 aVirtualKey); - static int PR_CALLBACK CompareDeadKeyEntries (const void* aArg1, const void* aArg2, void* aData); + static int CompareDeadKeyEntries (const void* aArg1, const void* aArg2, void* aData); static PRBool AddDeadKeyEntry (PRUint16 aBaseChar, PRUint16 aCompositeChar, DeadKeyEntry* aDeadKeyArray, PRUint32 aEntries); PRBool EnsureDeadKeyActive (PRBool aIsActive, PRUint8 aDeadKey, const PBYTE aDeadKeyKbdState); PRUint32 GetDeadKeyCombinations (PRUint8 aDeadKey, const PBYTE aDeadKeyKbdState, PRUint16 aShiftStatesWithBaseChars, diff --git a/widget/src/xpwidgets/nsAppShellSingleton.h b/widget/src/xpwidgets/nsAppShellSingleton.h index f863a9210f49..43748b270f93 100644 --- a/widget/src/xpwidgets/nsAppShellSingleton.h +++ b/widget/src/xpwidgets/nsAppShellSingleton.h @@ -61,7 +61,7 @@ static nsAppShell *sAppShell; -PR_STATIC_CALLBACK(nsresult) +static nsresult nsAppShellInit(nsIModule *module) { NS_ASSERTION(!sAppShell, "already initialized"); @@ -80,7 +80,7 @@ nsAppShellInit(nsIModule *module) return NS_OK; } -PR_STATIC_CALLBACK(void) +static void nsAppShellShutdown(nsIModule *module) { NS_RELEASE(sAppShell); diff --git a/xpcom/base/nsConsoleService.cpp b/xpcom/base/nsConsoleService.cpp index 805c78701b58..82a4b12a91a1 100644 --- a/xpcom/base/nsConsoleService.cpp +++ b/xpcom/base/nsConsoleService.cpp @@ -109,7 +109,7 @@ nsConsoleService::Init() return NS_OK; } -static PRBool PR_CALLBACK snapshot_enum_func(nsHashKey *key, void *data, void* closure) +static PRBool snapshot_enum_func(nsHashKey *key, void *data, void* closure) { nsISupportsArray *array = (nsISupportsArray *)closure; diff --git a/xpcom/base/nsCycleCollector.cpp b/xpcom/base/nsCycleCollector.cpp index d2f7c4dac269..412aa1efc6f3 100644 --- a/xpcom/base/nsCycleCollector.cpp +++ b/xpcom/base/nsCycleCollector.cpp @@ -798,7 +798,7 @@ struct nsPurpleBuffer } }; -static PR_CALLBACK PLDHashOperator +static PLDHashOperator zeroGenerationCallback(const void* ptr, PRUint32& generation, void* userArg) @@ -845,7 +845,7 @@ struct CallbackClosure static PRBool AddPurpleRoot(GCGraphBuilder &builder, nsISupports *root); -static PR_CALLBACK PLDHashOperator +static PLDHashOperator ageSelectionCallback(const void* ptr, PRUint32& generation, void* userArg) @@ -1187,7 +1187,7 @@ struct PtrToNodeEntry : public PLDHashEntryHdr PtrInfo *mNode; }; -PR_STATIC_CALLBACK(PRBool) +static PRBool PtrToNodeMatchEntry(PLDHashTable *table, const PLDHashEntryHdr *entry, const void *key) @@ -2492,7 +2492,7 @@ nsCycleCollector::Shutdown() #ifdef DEBUG_CC -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator AddExpectedGarbage(nsVoidPtrHashKey *p, void *arg) { GCGraphBuilder *builder = static_cast(arg); diff --git a/xpcom/base/nsErrorService.cpp b/xpcom/base/nsErrorService.cpp index f38495ed267d..44bd7e084243 100644 --- a/xpcom/base/nsErrorService.cpp +++ b/xpcom/base/nsErrorService.cpp @@ -38,13 +38,13 @@ #include "nsErrorService.h" #include "nsCRT.h" -static void* PR_CALLBACK +static void* CloneCString(nsHashKey *aKey, void *aData, void* closure) { return nsCRT::strdup((const char*)aData); } -static PRBool PR_CALLBACK +static PRBool DeleteCString(nsHashKey *aKey, void *aData, void* closure) { nsCRT::free((char*)aData); diff --git a/xpcom/base/nsExceptionService.h b/xpcom/base/nsExceptionService.h index 441a4c5b9177..5aa5334c91c6 100644 --- a/xpcom/base/nsExceptionService.h +++ b/xpcom/base/nsExceptionService.h @@ -81,7 +81,7 @@ public: static PRLock* lock; static PRUintn tlsIndex; - static void PR_CALLBACK ThreadDestruct( void *data ); + static void ThreadDestruct( void *data ); #ifdef NS_DEBUG static PRInt32 totalInstances; #endif diff --git a/xpcom/base/nsGarbageCollector.c b/xpcom/base/nsGarbageCollector.c index b0447598536a..f5a34c686ab5 100644 --- a/xpcom/base/nsGarbageCollector.c +++ b/xpcom/base/nsGarbageCollector.c @@ -65,7 +65,7 @@ extern FILE *GC_stdout, *GC_stderr; extern void GC_gcollect(void); extern void GC_clear_roots(void); -static PRStatus PR_CALLBACK scanner(PRThread* t, void** baseAddr, PRUword count, void* closure) +static PRStatus scanner(PRThread* t, void** baseAddr, PRUword count, void* closure) { char* begin = (char*)baseAddr; char* end = (char*)(baseAddr + count); diff --git a/xpcom/base/nsStackWalk.h b/xpcom/base/nsStackWalk.h index e8c0ef206f14..6c342d130657 100644 --- a/xpcom/base/nsStackWalk.h +++ b/xpcom/base/nsStackWalk.h @@ -47,7 +47,7 @@ PR_BEGIN_EXTERN_C typedef void -(* PR_CALLBACK NS_WalkStackCallback)(void *aPC, void *aClosure); +(* NS_WalkStackCallback)(void *aPC, void *aClosure); /** * Call aCallback for the C/C++ stack frames on the current thread, from diff --git a/xpcom/base/nsTraceRefcntImpl.cpp b/xpcom/base/nsTraceRefcntImpl.cpp index 7e5fb68076df..52310c17840c 100644 --- a/xpcom/base/nsTraceRefcntImpl.cpp +++ b/xpcom/base/nsTraceRefcntImpl.cpp @@ -147,25 +147,25 @@ struct nsTraceRefcntStats { // to the functions not called Default* to free the serialNumberRecord or // the BloatEntry. -static void * PR_CALLBACK +static void * DefaultAllocTable(void *pool, PRSize size) { return PR_MALLOC(size); } -static void PR_CALLBACK +static void DefaultFreeTable(void *pool, void *item) { PR_Free(item); } -static PLHashEntry * PR_CALLBACK +static PLHashEntry * DefaultAllocEntry(void *pool, const void *key) { return PR_NEW(PLHashEntry); } -static void PR_CALLBACK +static void SerialNumberFreeEntry(void *pool, PLHashEntry *he, PRUintn flag) { if (flag == HT_FREE_ENTRY) { @@ -174,7 +174,7 @@ SerialNumberFreeEntry(void *pool, PLHashEntry *he, PRUintn flag) } } -static void PR_CALLBACK +static void TypesToLogFreeEntry(void *pool, PLHashEntry *he, PRUintn flag) { if (flag == HT_FREE_ENTRY) { @@ -274,7 +274,7 @@ public: mNewStats.mObjsOutstandingSquared += cnt * cnt; } - static PRIntn PR_CALLBACK DumpEntry(PLHashEntry *he, PRIntn i, void *arg) { + static PRIntn DumpEntry(PLHashEntry *he, PRIntn i, void *arg) { BloatEntry* entry = (BloatEntry*)he->value; if (entry) { entry->Accumulate(); @@ -283,7 +283,7 @@ public: return HT_ENUMERATE_NEXT; } - static PRIntn PR_CALLBACK TotalEntries(PLHashEntry *he, PRIntn i, void *arg) { + static PRIntn TotalEntries(PLHashEntry *he, PRIntn i, void *arg) { BloatEntry* entry = (BloatEntry*)he->value; if (entry && nsCRT::strcmp(entry->mClassName, "TOTAL") != 0) { entry->Total((BloatEntry*)arg); @@ -386,7 +386,7 @@ protected: nsTraceRefcntStats mAllStats; }; -static void PR_CALLBACK +static void BloatViewFreeEntry(void *pool, PLHashEntry *he, PRUintn flag) { if (flag == HT_FREE_ENTRY) { @@ -437,7 +437,7 @@ GetBloatEntry(const char* aTypeName, PRUint32 aInstanceSize) return entry; } -static PRIntn PR_CALLBACK DumpSerialNumbers(PLHashEntry* aHashEntry, PRIntn aIndex, void* aClosure) +static PRIntn DumpSerialNumbers(PLHashEntry* aHashEntry, PRIntn aIndex, void* aClosure) { serialNumberRecord* record = reinterpret_cast(aHashEntry->value); #ifdef HAVE_CPP_DYNAMIC_CAST_TO_VOID_PTR @@ -653,7 +653,7 @@ static PRBool InitLog(const char* envVar, const char* msg, FILE* *result) } -static PLHashNumber PR_CALLBACK HashNumber(const void* aKey) +static PLHashNumber HashNumber(const void* aKey) { return PLHashNumber(NS_PTR_TO_INT32(aKey)); } @@ -826,7 +826,7 @@ static void InitTraceLog(void) extern "C" { -PR_STATIC_CALLBACK(void) PrintStackFrame(void *aPC, void *aClosure) +static void PrintStackFrame(void *aPC, void *aClosure) { FILE *stream = (FILE*)aClosure; nsCodeAddressDetails details; diff --git a/xpcom/build/nsXPCOM.h b/xpcom/build/nsXPCOM.h index 5cbf8fdce545..cd30a34a8d2c 100644 --- a/xpcom/build/nsXPCOM.h +++ b/xpcom/build/nsXPCOM.h @@ -98,9 +98,9 @@ DECL_CLASS(nsITraceRefcnt); * * @status FROZEN */ -typedef nsresult (PR_CALLBACK *nsGetModuleProc)(nsIComponentManager *aCompMgr, - nsIFile* location, - nsIModule** return_cobj); +typedef nsresult (*nsGetModuleProc)(nsIComponentManager *aCompMgr, + nsIFile* location, + nsIModule** return_cobj); /** * Initialises XPCOM. You must call one of the NS_InitXPCOM methods diff --git a/xpcom/build/nsXPCOMPrivate.h b/xpcom/build/nsXPCOMPrivate.h index 5e20ed17e4da..0c18c3102752 100644 --- a/xpcom/build/nsXPCOMPrivate.h +++ b/xpcom/build/nsXPCOMPrivate.h @@ -196,7 +196,7 @@ typedef struct XPCOMFunctions{ } XPCOMFunctions; -typedef nsresult (PR_CALLBACK *GetFrozenFunctionsFunc)(XPCOMFunctions *entryPoints, const char* libraryPath); +typedef nsresult (*GetFrozenFunctionsFunc)(XPCOMFunctions *entryPoints, const char* libraryPath); XPCOM_API(nsresult) NS_GetFrozenFunctions(XPCOMFunctions *entryPoints, const char* libraryPath); diff --git a/xpcom/build/nsXPComInit.cpp b/xpcom/build/nsXPComInit.cpp index fd136651ea30..629b520779fd 100644 --- a/xpcom/build/nsXPComInit.cpp +++ b/xpcom/build/nsXPComInit.cpp @@ -264,7 +264,7 @@ nsXPTIInterfaceInfoManagerGetSingleton(nsISupports* outer, } -PR_STATIC_CALLBACK(nsresult) +static nsresult RegisterGenericFactory(nsIComponentRegistrar* registrar, const nsModuleComponentInfo *info) { diff --git a/xpcom/components/nsCategoryManager.cpp b/xpcom/components/nsCategoryManager.cpp index 1f06b89cc220..0ed15bfa27ee 100644 --- a/xpcom/components/nsCategoryManager.cpp +++ b/xpcom/components/nsCategoryManager.cpp @@ -190,12 +190,12 @@ public: static EntryEnumerator* Create(nsTHashtable& aTable); private: - static PLDHashOperator PR_CALLBACK + static PLDHashOperator enumfunc_createenumerator(CategoryLeaf* aLeaf, void* userArg); }; -PLDHashOperator PR_CALLBACK +PLDHashOperator EntryEnumerator::enumfunc_createenumerator(CategoryLeaf* aLeaf, void* userArg) { EntryEnumerator* mythis = static_cast(userArg); @@ -392,7 +392,7 @@ struct persistent_userstruct { PRBool success; }; -PLDHashOperator PR_CALLBACK +PLDHashOperator enumfunc_pentries(CategoryLeaf* aLeaf, void* userArg) { persistent_userstruct* args = @@ -442,7 +442,7 @@ public: static CategoryEnumerator* Create(nsClassHashtable& aTable); private: - static PLDHashOperator PR_CALLBACK + static PLDHashOperator enumfunc_createenumerator(const char* aStr, CategoryNode* aNode, void* userArg); @@ -466,7 +466,7 @@ CategoryEnumerator::Create(nsClassHashtable& aTa return enumObj; } -PLDHashOperator PR_CALLBACK +PLDHashOperator CategoryEnumerator::enumfunc_createenumerator(const char* aStr, CategoryNode* aNode, void* userArg) { CategoryEnumerator* mythis = static_cast(userArg); @@ -745,7 +745,7 @@ struct writecat_struct { PRBool success; }; -PLDHashOperator PR_CALLBACK +PLDHashOperator enumfunc_categories(const char* aKey, CategoryNode* aCategory, void* userArg) { writecat_struct* args = static_cast(userArg); diff --git a/xpcom/components/nsComponentManager.cpp b/xpcom/components/nsComponentManager.cpp index 4ff8bdb578b6..e81187f0f0d6 100644 --- a/xpcom/components/nsComponentManager.cpp +++ b/xpcom/components/nsComponentManager.cpp @@ -232,10 +232,10 @@ ArenaStrdup(const char *s, PLArenaPool *arena) // Hashtable Callbacks //////////////////////////////////////////////////////////////////////////////// -PRBool PR_CALLBACK +PRBool nsFactoryEntry_Destroy(nsHashKey *aKey, void *aData, void* closure); -PR_STATIC_CALLBACK(PLDHashNumber) +static PLDHashNumber factory_HashKey(PLDHashTable *aTable, const void *aKey) { const nsCID *cidp = reinterpret_cast(aKey); @@ -243,7 +243,7 @@ factory_HashKey(PLDHashTable *aTable, const void *aKey) return cidp->m0; } -PR_STATIC_CALLBACK(PRBool) +static PRBool factory_MatchEntry(PLDHashTable *aTable, const PLDHashEntryHdr *aHdr, const void *aKey) { @@ -254,7 +254,7 @@ factory_MatchEntry(PLDHashTable *aTable, const PLDHashEntryHdr *aHdr, return (entry->mFactoryEntry->mCid).Equals(*cidp); } -PR_STATIC_CALLBACK(void) +static void factory_ClearEntry(PLDHashTable *aTable, PLDHashEntryHdr *aHdr) { nsFactoryTableEntry* entry = static_cast(aHdr); @@ -274,7 +274,7 @@ static const PLDHashTableOps factory_DHashTableOps = { PL_DHashFinalizeStub, }; -PR_STATIC_CALLBACK(void) +static void contractID_ClearEntry(PLDHashTable *aTable, PLDHashEntryHdr *aHdr) { nsContractIDTableEntry* entry = static_cast(aHdr); @@ -339,14 +339,14 @@ private: PLDHashTableEnumeratorImpl *impl; }; - static PLDHashOperator PR_CALLBACK Enumerator(PLDHashTable *table, - PLDHashEntryHdr *hdr, - PRUint32 number, - void *data); + static PLDHashOperator Enumerator(PLDHashTable *table, + PLDHashEntryHdr *hdr, + PRUint32 number, + void *data); }; // static -PLDHashOperator PR_CALLBACK +PLDHashOperator PLDHashTableEnumeratorImpl::Enumerator(PLDHashTable *table, PLDHashEntryHdr *hdr, PRUint32 number, @@ -1083,7 +1083,7 @@ struct PersistentWriterArgs nsTArray *mLoaderData; }; -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator ContractIDWriter(PLDHashTable *table, PLDHashEntryHdr *hdr, PRUint32 number, @@ -1107,7 +1107,7 @@ ContractIDWriter(PLDHashTable *table, return PL_DHASH_NEXT; } -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator ClassIDWriter(PLDHashTable *table, PLDHashEntryHdr *hdr, PRUint32 number, @@ -1705,7 +1705,7 @@ nsComponentManagerImpl::CreateInstanceByContractID(const char *aContractID, // Service Manager Impl static -PLDHashOperator PR_CALLBACK +PLDHashOperator FreeServiceFactoryEntryEnumerate(PLDHashTable *aTable, PLDHashEntryHdr *aHdr, PRUint32 aNumber, @@ -1722,7 +1722,7 @@ FreeServiceFactoryEntryEnumerate(PLDHashTable *aTable, } static -PLDHashOperator PR_CALLBACK +PLDHashOperator FreeServiceContractIDEntryEnumerate(PLDHashTable *aTable, PLDHashEntryHdr *aHdr, PRUint32 aNumber, @@ -2789,7 +2789,7 @@ typedef struct nsIFactory* factory; } UnregisterConditions; -static PLDHashOperator PR_CALLBACK +static PLDHashOperator DeleteFoundCIDs(PLDHashTable *aTable, PLDHashEntryHdr *aHdr, PRUint32 aNumber, diff --git a/xpcom/components/nsModule.h b/xpcom/components/nsModule.h index 77311db41249..0f8c07f6fcf2 100644 --- a/xpcom/components/nsModule.h +++ b/xpcom/components/nsModule.h @@ -46,7 +46,7 @@ // Exported Function from module dll to Create the nsIModule #define NS_GET_MODULE_SYMBOL "NSGetModule" -extern "C" NS_EXPORT nsresult PR_CALLBACK +extern "C" NS_EXPORT nsresult NSGetModule(nsIComponentManager *aCompMgr, nsIFile* location, nsIModule** return_cobj); diff --git a/xpcom/components/nsStaticComponentLoader.cpp b/xpcom/components/nsStaticComponentLoader.cpp index fd41c6a2ca1d..d8e38af2fd12 100644 --- a/xpcom/components/nsStaticComponentLoader.cpp +++ b/xpcom/components/nsStaticComponentLoader.cpp @@ -63,7 +63,7 @@ struct StaticModuleInfo : public PLDHashEntryHdr { StaticModuleInfo *next; }; -PR_STATIC_CALLBACK(void) +static void info_ClearEntry(PLDHashTable *table, PLDHashEntryHdr *entry) { StaticModuleInfo *info = static_cast(entry); @@ -71,7 +71,7 @@ info_ClearEntry(PLDHashTable *table, PLDHashEntryHdr *entry) info->~StaticModuleInfo(); } -PR_STATIC_CALLBACK(PRBool) +static PRBool info_InitEntry(PLDHashTable *table, PLDHashEntryHdr *entry, const void *key) { // Construct so that our nsCOMPtr is zeroed, etc. diff --git a/xpcom/ds/nsArray.cpp b/xpcom/ds/nsArray.cpp index f81dff9be45d..689aeb695d56 100644 --- a/xpcom/ds/nsArray.cpp +++ b/xpcom/ds/nsArray.cpp @@ -48,7 +48,7 @@ struct findIndexOfClosure PRUint32 resultIndex; }; -PR_STATIC_CALLBACK(PRBool) FindElementCallback(void* aElement, void* aClosure); +static PRBool FindElementCallback(void* aElement, void* aClosure); NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsArray) NS_INTERFACE_MAP_ENTRY(nsIArray) diff --git a/xpcom/ds/nsAtomTable.cpp b/xpcom/ds/nsAtomTable.cpp index 1d3c7ba83820..472d250101b2 100644 --- a/xpcom/ds/nsAtomTable.cpp +++ b/xpcom/ds/nsAtomTable.cpp @@ -262,7 +262,7 @@ struct AtomTableEntry : public PLDHashEntryHdr { } }; -PR_STATIC_CALLBACK(PLDHashNumber) +static PLDHashNumber AtomTableGetHash(PLDHashTable *table, const void *key) { const AtomTableEntry *e = static_cast(key); @@ -277,7 +277,7 @@ AtomTableGetHash(PLDHashTable *table, const void *key) return nsCRT::HashCode(e->getUTF8String(), e->getLength()); } -PR_STATIC_CALLBACK(PRBool) +static PRBool AtomTableMatchKey(PLDHashTable *table, const PLDHashEntryHdr *entry, const void *key) { @@ -309,7 +309,7 @@ AtomTableMatchKey(PLDHashTable *table, const PLDHashEntryHdr *entry, return memcmp(atomString, str, length * sizeof(char)) == 0; } -PR_STATIC_CALLBACK(void) +static void AtomTableClearEntry(PLDHashTable *table, PLDHashEntryHdr *entry) { AtomTableEntry *he = static_cast(entry); @@ -335,7 +335,7 @@ AtomTableClearEntry(PLDHashTable *table, PLDHashEntryHdr *entry) he->ClearAtom(); } -PR_STATIC_CALLBACK(PRBool) +static PRBool AtomTableInitEntry(PLDHashTable *table, PLDHashEntryHdr *entry, const void *key) { @@ -362,7 +362,7 @@ static const PLDHashTableOps AtomTableOps = { #ifdef DEBUG -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator DumpAtomLeaks(PLDHashTable *table, PLDHashEntryHdr *he, PRUint32 index, void *arg) { diff --git a/xpcom/ds/nsDoubleHashtable.h b/xpcom/ds/nsDoubleHashtable.h index c19a64e696b0..4103592472e9 100644 --- a/xpcom/ds/nsDoubleHashtable.h +++ b/xpcom/ds/nsDoubleHashtable.h @@ -202,25 +202,25 @@ // ENTRY_CLASS: the classname of the entry // #define DHASH_CALLBACKS(ENTRY_CLASS) \ -PR_STATIC_CALLBACK(PLDHashNumber) \ +static PLDHashNumber \ ENTRY_CLASS##HashKey(PLDHashTable* table, const void* key) \ { \ return ENTRY_CLASS::HashKey(key); \ } \ -PR_STATIC_CALLBACK(PRBool) \ +static PRBool \ ENTRY_CLASS##MatchEntry(PLDHashTable *table, const PLDHashEntryHdr *entry, \ const void *key) \ { \ const ENTRY_CLASS* e = static_cast(entry); \ return e->MatchEntry(key); \ } \ -PR_STATIC_CALLBACK(void) \ +static void \ ENTRY_CLASS##ClearEntry(PLDHashTable *table, PLDHashEntryHdr *entry) \ { \ ENTRY_CLASS* e = static_cast(entry); \ e->~ENTRY_CLASS(); \ } \ -PR_STATIC_CALLBACK(PRBool) \ +static PRBool \ ENTRY_CLASS##InitEntry(PLDHashTable *table, PLDHashEntryHdr *entry, \ const void *key) \ { \ diff --git a/xpcom/ds/nsHashPropertyBag.cpp b/xpcom/ds/nsHashPropertyBag.cpp index 980b07f185b3..a0b73bcce248 100755 --- a/xpcom/ds/nsHashPropertyBag.cpp +++ b/xpcom/ds/nsHashPropertyBag.cpp @@ -178,7 +178,7 @@ nsSimpleProperty::GetValue(nsIVariant* *aValue) // end nsSimpleProperty -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator PropertyHashToArrayFunc (const nsAString &aKey, nsIVariant* aData, void *userArg) diff --git a/xpcom/ds/nsHashtable.cpp b/xpcom/ds/nsHashtable.cpp index 4566000ff31d..59ba3d2a968f 100644 --- a/xpcom/ds/nsHashtable.cpp +++ b/xpcom/ds/nsHashtable.cpp @@ -65,7 +65,7 @@ struct HTEntry : PLDHashEntryHdr // Key operations // -PR_STATIC_CALLBACK(PRBool) +static PRBool matchKeyEntry(PLDHashTable*, const PLDHashEntryHdr* entry, const void* key) { @@ -79,7 +79,7 @@ matchKeyEntry(PLDHashTable*, const PLDHashEntryHdr* entry, return otherKey->Equals(hashEntry->key); } -PR_STATIC_CALLBACK(PLDHashNumber) +static PLDHashNumber hashKey(PLDHashTable* table, const void* key) { const nsHashKey* hashKey = static_cast(key); @@ -87,7 +87,7 @@ hashKey(PLDHashTable* table, const void* key) return hashKey->HashCode(); } -PR_STATIC_CALLBACK(void) +static void clearHashEntry(PLDHashTable* table, PLDHashEntryHdr* entry) { HTEntry* hashEntry = static_cast(entry); @@ -121,7 +121,7 @@ struct _HashEnumerateArgs { void* arg; }; -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator hashEnumerate(PLDHashTable* table, PLDHashEntryHdr* hdr, PRUint32 i, void *arg) { _HashEnumerateArgs* thunk = (_HashEnumerateArgs*)arg; @@ -282,7 +282,7 @@ void *nsHashtable::Remove(nsHashKey *aKey) // XXX This method was called _hashEnumerateCopy, but it didn't copy the element! // I don't know how this was supposed to work since the elements are neither copied // nor refcounted. -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator hashEnumerateShare(PLDHashTable *table, PLDHashEntryHdr *hdr, PRUint32 i, void *arg) { @@ -317,7 +317,7 @@ void nsHashtable::Enumerate(nsHashtableEnumFunc aEnumFunc, void* aClosure) mEnumerating = wasEnumerating; } -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator hashEnumerateRemove(PLDHashTable*, PLDHashEntryHdr* hdr, PRUint32 i, void *arg) { HTEntry* entry = static_cast(hdr); @@ -411,7 +411,7 @@ struct WriteEntryArgs { nsresult mRetVal; }; -PR_STATIC_CALLBACK(PRBool) +static PRBool WriteEntry(nsHashKey *aKey, void *aData, void* aClosure) { WriteEntryArgs* args = (WriteEntryArgs*) aClosure; @@ -750,7 +750,7 @@ nsObjectHashtable::~nsObjectHashtable() } -PLDHashOperator PR_CALLBACK +PLDHashOperator nsObjectHashtable::CopyElement(PLDHashTable* table, PLDHashEntryHdr* hdr, PRUint32 i, void *arg) @@ -802,7 +802,7 @@ nsObjectHashtable::RemoveAndDelete(nsHashKey *aKey) //////////////////////////////////////////////////////////////////////////////// // nsSupportsHashtable: an nsHashtable where the elements are nsISupports* -PRBool PR_CALLBACK +PRBool nsSupportsHashtable::ReleaseElement(nsHashKey *aKey, void *aData, void* aClosure) { nsISupports* element = static_cast(aData); @@ -855,7 +855,7 @@ nsSupportsHashtable::Remove(nsHashKey *aKey, nsISupports **value) return data != nsnull; } -PLDHashOperator PR_CALLBACK +PLDHashOperator nsSupportsHashtable::EnumerateCopy(PLDHashTable*, PLDHashEntryHdr* hdr, PRUint32 i, void *arg) diff --git a/xpcom/ds/nsHashtable.h b/xpcom/ds/nsHashtable.h index 21ce90283b91..730427efbeb9 100644 --- a/xpcom/ds/nsHashtable.h +++ b/xpcom/ds/nsHashtable.h @@ -114,22 +114,19 @@ enum { }; typedef PRIntn -(*PR_CALLBACK nsHashtableEnumFunc)(nsHashKey *aKey, void *aData, void* aClosure); +(* nsHashtableEnumFunc)(nsHashKey *aKey, void *aData, void* aClosure); typedef nsresult -(*PR_CALLBACK nsHashtableReadEntryFunc)(nsIObjectInputStream *aStream, - nsHashKey **aKey, - void **aData); +(* nsHashtableReadEntryFunc)(nsIObjectInputStream *aStream, nsHashKey **aKey, + void **aData); // NB: may be called with null aKey or aData, to free just one of the two. typedef void -(*PR_CALLBACK nsHashtableFreeEntryFunc)(nsIObjectInputStream *aStream, - nsHashKey *aKey, - void *aData); +(* nsHashtableFreeEntryFunc)(nsIObjectInputStream *aStream, nsHashKey *aKey, + void *aData); typedef nsresult -(*PR_CALLBACK nsHashtableWriteDataFunc)(nsIObjectOutputStream *aStream, - void *aData); +(* nsHashtableWriteDataFunc)(nsIObjectOutputStream *aStream, void *aData); class NS_COM nsHashtable { protected: @@ -164,7 +161,7 @@ class NS_COM nsHashtable { // nsObjectHashtable: an nsHashtable where the elements are C++ objects to be // deleted -typedef void* (*PR_CALLBACK nsHashtableCloneElementFunc)(nsHashKey *aKey, void *aData, void* aClosure); +typedef void* (* nsHashtableCloneElementFunc)(nsHashKey *aKey, void *aData, void* aClosure); class NS_COM nsObjectHashtable : public nsHashtable { public: @@ -180,9 +177,9 @@ class NS_COM nsObjectHashtable : public nsHashtable { PRBool RemoveAndDelete(nsHashKey *aKey); protected: - static PLDHashOperator PR_CALLBACK CopyElement(PLDHashTable* table, - PLDHashEntryHdr* hdr, - PRUint32 i, void *arg); + static PLDHashOperator CopyElement(PLDHashTable* table, + PLDHashEntryHdr* hdr, + PRUint32 i, void *arg); nsHashtableCloneElementFunc mCloneElementFun; void* mCloneElementClosure; @@ -199,7 +196,7 @@ class NS_COM nsSupportsHashtable : private nsHashtable { public: - typedef PRBool (* PR_CALLBACK EnumFunc) (nsHashKey *aKey, void *aData, void* aClosure); + typedef PRBool (* EnumFunc) (nsHashKey *aKey, void *aData, void* aClosure); nsSupportsHashtable(PRUint32 aSize = 16, PRBool threadSafe = PR_FALSE) : nsHashtable(aSize, threadSafe) {} @@ -223,10 +220,10 @@ class NS_COM nsSupportsHashtable void Reset(); private: - static PRBool PR_CALLBACK ReleaseElement(nsHashKey *, void *, void *); - static PLDHashOperator PR_CALLBACK EnumerateCopy(PLDHashTable*, - PLDHashEntryHdr* hdr, - PRUint32 i, void *arg); + static PRBool ReleaseElement(nsHashKey *, void *, void *); + static PLDHashOperator EnumerateCopy(PLDHashTable*, + PLDHashEntryHdr* hdr, + PRUint32 i, void *arg); }; //////////////////////////////////////////////////////////////////////////////// diff --git a/xpcom/ds/nsPersistentProperties.cpp b/xpcom/ds/nsPersistentProperties.cpp index 09acc56e98e3..150744e98dfd 100644 --- a/xpcom/ds/nsPersistentProperties.cpp +++ b/xpcom/ds/nsPersistentProperties.cpp @@ -615,7 +615,7 @@ nsPersistentProperties::GetStringProperty(const nsACString& aKey, return NS_OK; } -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator AddElemToArray(PLDHashTable* table, PLDHashEntryHdr *hdr, PRUint32 i, void *arg) { diff --git a/xpcom/ds/nsProperties.cpp b/xpcom/ds/nsProperties.cpp index e04463a57a30..cdf08415d253 100644 --- a/xpcom/ds/nsProperties.cpp +++ b/xpcom/ds/nsProperties.cpp @@ -97,7 +97,7 @@ struct GetKeysEnumData nsresult res; }; -PR_CALLBACK PLDHashOperator + PLDHashOperator GetKeysEnumerate(const char *key, nsISupports* data, void *arg) { diff --git a/xpcom/ds/nsStaticNameTable.cpp b/xpcom/ds/nsStaticNameTable.cpp index 7ee49ae1c105..863287aafcd7 100644 --- a/xpcom/ds/nsStaticNameTable.cpp +++ b/xpcom/ds/nsStaticNameTable.cpp @@ -77,7 +77,7 @@ struct NameTableEntry : public PLDHashEntryHdr PRInt32 mIndex; }; -PR_STATIC_CALLBACK(PRBool) +static PRBool matchNameKeysCaseInsensitive(PLDHashTable*, const PLDHashEntryHdr* aHdr, const void* key) { @@ -104,7 +104,7 @@ matchNameKeysCaseInsensitive(PLDHashTable*, const PLDHashEntryHdr* aHdr, * to the same value, but it's just a hash function so it doesn't * matter. */ -PR_STATIC_CALLBACK(PLDHashNumber) +static PLDHashNumber caseInsensitiveStringHashKey(PLDHashTable *table, const void *key) { PLDHashNumber h = 0; diff --git a/xpcom/glue/nsAutoLock.cpp b/xpcom/glue/nsAutoLock.cpp index 77d18e28139d..d310152cc57d 100644 --- a/xpcom/glue/nsAutoLock.cpp +++ b/xpcom/glue/nsAutoLock.cpp @@ -73,19 +73,19 @@ struct nsNamedVector : public nsVoidArray { } }; -static void * PR_CALLBACK +static void * _hash_alloc_table(void *pool, PRSize size) { return operator new(size); } -static void PR_CALLBACK +static void _hash_free_table(void *pool, void *item) { operator delete(item); } -static PLHashEntry * PR_CALLBACK +static PLHashEntry * _hash_alloc_entry(void *pool, const void *key) { return new PLHashEntry; @@ -109,7 +109,7 @@ _hash_alloc_entry(void *pool, const void *key) * XXX so we should have nsLock, nsMonitor, etc. and strongly type their * XXX nsAutoXXX counterparts to take only the non-auto types as inputs */ -static void PR_CALLBACK +static void _hash_free_entry(void *pool, PLHashEntry *entry, PRUintn flag) { nsNamedVector* vec = (nsNamedVector*) entry->value; @@ -126,7 +126,7 @@ static const PLHashAllocOps _hash_alloc_ops = { _hash_alloc_entry, _hash_free_entry }; -PR_STATIC_CALLBACK(PRIntn) +static PRIntn _purge_one(PLHashEntry* he, PRIntn cnt, void* arg) { nsNamedVector* vec = (nsNamedVector*) he->value; @@ -137,7 +137,7 @@ _purge_one(PLHashEntry* he, PRIntn cnt, void* arg) return HT_ENUMERATE_NEXT; } -PR_STATIC_CALLBACK(void) +static void OnSemaphoreRecycle(void* addr) { if (OrderTable) { @@ -147,7 +147,7 @@ OnSemaphoreRecycle(void* addr) } } -PR_STATIC_CALLBACK(PLHashNumber) +static PLHashNumber _hash_pointer(const void* key) { return PLHashNumber(NS_PTR_TO_INT32(key)) >> 2; diff --git a/xpcom/glue/nsBaseHashtable.h b/xpcom/glue/nsBaseHashtable.h index 48e9fd8f3b29..952a20fb968d 100644 --- a/xpcom/glue/nsBaseHashtable.h +++ b/xpcom/glue/nsBaseHashtable.h @@ -168,9 +168,9 @@ public: * @link PLDHashOperator::PL_DHASH_STOP PL_DHASH_STOP @endlink */ typedef PLDHashOperator - (*PR_CALLBACK EnumReadFunction)(KeyType aKey, - UserDataType aData, - void* userArg); + (* EnumReadFunction)(KeyType aKey, + UserDataType aData, + void* userArg); /** * enumerate entries in the hashtable, without allowing changes @@ -200,9 +200,9 @@ public: * @link PLDHashOperator::PL_DHASH_STOP PL_DHASH_STOP @endlink */ typedef PLDHashOperator - (*PR_CALLBACK EnumFunction)(KeyType aKey, - DataType& aData, - void* userArg); + (* EnumFunction)(KeyType aKey, + DataType& aData, + void* userArg); /** * enumerate entries in the hashtable, allowing changes. This diff --git a/xpcom/glue/nsCOMArray.cpp b/xpcom/glue/nsCOMArray.cpp index 444b9b03f34c..b22bbfb68ada 100644 --- a/xpcom/glue/nsCOMArray.cpp +++ b/xpcom/glue/nsCOMArray.cpp @@ -39,7 +39,7 @@ #include "nsCOMArray.h" #include "nsCOMPtr.h" -PR_STATIC_CALLBACK(PRBool) ReleaseObjects(void* aElement, void*); +static PRBool ReleaseObjects(void* aElement, void*); // implementations of non-trivial methods in nsCOMArray_base diff --git a/xpcom/glue/nsCOMArray.h b/xpcom/glue/nsCOMArray.h index c83a7ec267f3..9b25fef4bee7 100644 --- a/xpcom/glue/nsCOMArray.h +++ b/xpcom/glue/nsCOMArray.h @@ -219,8 +219,8 @@ class nsCOMArray : public nsCOMArray_base // Enumerator callback function. Return PR_FALSE to stop // Here's a more readable form: - // PRBool PR_CALLBACK enumerate(T* aElement, void* aData) - typedef PRBool (* PR_CALLBACK nsCOMArrayEnumFunc) + // PRBool enumerate(T* aElement, void* aData) + typedef PRBool (* nsCOMArrayEnumFunc) (T* aElement, void *aData); // enumerate through the array with a callback. @@ -234,7 +234,7 @@ class nsCOMArray : public nsCOMArray_base aData); } - typedef int (* PR_CALLBACK nsCOMArrayComparatorFunc) + typedef int (* nsCOMArrayComparatorFunc) (T* aElement1, T* aElement2, void* aData); void Sort(nsCOMArrayComparatorFunc aFunc, void* aData) { diff --git a/xpcom/glue/nsCycleCollectionParticipant.cpp b/xpcom/glue/nsCycleCollectionParticipant.cpp index 9d3e6934c6cb..bd86f769f90d 100644 --- a/xpcom/glue/nsCycleCollectionParticipant.cpp +++ b/xpcom/glue/nsCycleCollectionParticipant.cpp @@ -38,7 +38,7 @@ #include "nsCycleCollectionParticipant.h" #include "nsCOMPtr.h" -PR_STATIC_CALLBACK(void) +static void NoteChild(PRUint32 aLangID, void *aScriptThing, void *aClosure) { nsCycleCollectionTraversalCallback *cb = diff --git a/xpcom/glue/nsCycleCollectionParticipant.h b/xpcom/glue/nsCycleCollectionParticipant.h index 465b0831b1d9..e36648fec89b 100644 --- a/xpcom/glue/nsCycleCollectionParticipant.h +++ b/xpcom/glue/nsCycleCollectionParticipant.h @@ -139,7 +139,7 @@ NS_DEFINE_STATIC_IID_ACCESSOR(nsCycleCollectionParticipant, #define IMETHOD_VISIBILITY NS_COM_GLUE typedef void -(* PR_CALLBACK TraceCallback)(PRUint32 langID, void *p, void *closure); +(* TraceCallback)(PRUint32 langID, void *p, void *closure); class NS_NO_VTABLE nsScriptObjectTracer : public nsCycleCollectionParticipant { diff --git a/xpcom/glue/nsIGenericFactory.h b/xpcom/glue/nsIGenericFactory.h index cd4df9f2a86f..97e9e01c151f 100644 --- a/xpcom/glue/nsIGenericFactory.h +++ b/xpcom/glue/nsIGenericFactory.h @@ -260,7 +260,7 @@ struct nsModuleComponentInfo { * NS_ERROR* Method failure which will result in module not being * loaded. **/ -typedef nsresult (PR_CALLBACK *nsModuleConstructorProc) (nsIModule *self); +typedef nsresult (*nsModuleConstructorProc) (nsIModule *self); /** @@ -270,7 +270,7 @@ typedef nsresult (PR_CALLBACK *nsModuleConstructorProc) (nsIModule *self); * @param self module which is being destroyed. * **/ -typedef void (PR_CALLBACK *nsModuleDestructorProc) (nsIModule *self); +typedef void (*nsModuleDestructorProc) (nsIModule *self); /** * nsModuleInfo diff --git a/xpcom/glue/nsINIParser.h b/xpcom/glue/nsINIParser.h index 029b1cac68d5..3fbb2aaa966f 100644 --- a/xpcom/glue/nsINIParser.h +++ b/xpcom/glue/nsINIParser.h @@ -82,8 +82,7 @@ public: * @return PR_FALSE to stop enumeration, or PR_TRUE to continue. */ typedef PRBool - (* PR_CALLBACK INISectionCallback)(const char *aSection, - void *aClosure); + (* INISectionCallback)(const char *aSection, void *aClosure); /** * Enumerate the sections within the INI file. @@ -95,9 +94,8 @@ public: * @return PR_FALSE to stop enumeration, or PR_TRUE to continue */ typedef PRBool - (* PR_CALLBACK INIStringCallback)(const char *aString, - const char *aValue, - void *aClosure); + (* INIStringCallback)(const char *aString, const char *aValue, + void *aClosure); /** * Enumerate the strings within a section. If the section does diff --git a/xpcom/glue/nsTHashtable.h b/xpcom/glue/nsTHashtable.h index c97354189572..686a08753615 100644 --- a/xpcom/glue/nsTHashtable.h +++ b/xpcom/glue/nsTHashtable.h @@ -224,7 +224,7 @@ public: * @link PLDHashOperator::PL_DHASH_STOP PL_DHASH_STOP @endlink , * @link PLDHashOperator::PL_DHASH_REMOVE PL_DHASH_REMOVE @endlink */ - typedef PLDHashOperator (*PR_CALLBACK Enumerator)(EntryType* aEntry, void* userArg); + typedef PLDHashOperator (* Enumerator)(EntryType* aEntry, void* userArg); /** * Enumerate all the entries of the function. @@ -254,26 +254,26 @@ public: protected: PLDHashTable mTable; - static const void* PR_CALLBACK s_GetKey(PLDHashTable *table, - PLDHashEntryHdr *entry); + static const void* s_GetKey(PLDHashTable *table, + PLDHashEntryHdr *entry); - static PLDHashNumber PR_CALLBACK s_HashKey(PLDHashTable *table, - const void *key); + static PLDHashNumber s_HashKey(PLDHashTable *table, + const void *key); - static PRBool PR_CALLBACK s_MatchEntry(PLDHashTable *table, - const PLDHashEntryHdr *entry, - const void *key); + static PRBool s_MatchEntry(PLDHashTable *table, + const PLDHashEntryHdr *entry, + const void *key); - static void PR_CALLBACK s_CopyEntry(PLDHashTable *table, - const PLDHashEntryHdr *from, - PLDHashEntryHdr *to); + static void s_CopyEntry(PLDHashTable *table, + const PLDHashEntryHdr *from, + PLDHashEntryHdr *to); - static void PR_CALLBACK s_ClearEntry(PLDHashTable *table, - PLDHashEntryHdr *entry); + static void s_ClearEntry(PLDHashTable *table, + PLDHashEntryHdr *entry); - static PRBool PR_CALLBACK s_InitEntry(PLDHashTable *table, - PLDHashEntryHdr *entry, - const void *key); + static PRBool s_InitEntry(PLDHashTable *table, + PLDHashEntryHdr *entry, + const void *key); /** * passed internally during enumeration. Allocated on the stack. @@ -288,10 +288,10 @@ protected: void* userArg; }; - static PLDHashOperator PR_CALLBACK s_EnumStub(PLDHashTable *table, - PLDHashEntryHdr *entry, - PRUint32 number, - void *arg); + static PLDHashOperator s_EnumStub(PLDHashTable *table, + PLDHashEntryHdr *entry, + PRUint32 number, + void *arg); private: // copy constructor, not implemented nsTHashtable(nsTHashtable& toCopy); diff --git a/xpcom/glue/nsVoidArray.cpp b/xpcom/glue/nsVoidArray.cpp index bd7145ca72a9..303a5ca3681a 100644 --- a/xpcom/glue/nsVoidArray.cpp +++ b/xpcom/glue/nsVoidArray.cpp @@ -647,7 +647,7 @@ struct VoidArrayComparatorContext { void* mData; }; -PR_STATIC_CALLBACK(int) +static int VoidArrayComparator(const void* aElement1, const void* aElement2, void* aData) { VoidArrayComparatorContext* ctx = static_cast(aData); @@ -861,7 +861,7 @@ nsStringArray::Clear(void) nsVoidArray::Clear(); } -PR_STATIC_CALLBACK(int) +static int CompareString(const nsString* aString1, const nsString* aString2, void*) { #ifdef MOZILLA_INTERNAL_API @@ -1153,7 +1153,7 @@ nsCStringArray::Clear(void) nsVoidArray::Clear(); } -PR_STATIC_CALLBACK(int) +static int CompareCString(const nsCString* aCString1, const nsCString* aCString2, void*) { #ifdef MOZILLA_INTERNAL_API @@ -1178,7 +1178,7 @@ CompareCString(const nsCString* aCString1, const nsCString* aCString2, void*) } #ifdef MOZILLA_INTERNAL_API -PR_STATIC_CALLBACK(int) +static int CompareCStringIgnoreCase(const nsCString* aCString1, const nsCString* aCString2, void*) { return Compare(*aCString1, *aCString2, nsCaseInsensitiveCStringComparator()); diff --git a/xpcom/glue/nsVoidArray.h b/xpcom/glue/nsVoidArray.h index acd2075d3669..b76e19491889 100644 --- a/xpcom/glue/nsVoidArray.h +++ b/xpcom/glue/nsVoidArray.h @@ -44,11 +44,11 @@ #include "nsDebug.h" // Comparator callback function for sorting array values. -typedef int (* PR_CALLBACK nsVoidArrayComparatorFunc) +typedef int (* nsVoidArrayComparatorFunc) (const void* aElement1, const void* aElement2, void* aData); // Enumerator callback function. Return PR_FALSE to stop -typedef PRBool (* PR_CALLBACK nsVoidArrayEnumFunc)(void* aElement, void *aData); +typedef PRBool (* nsVoidArrayEnumFunc)(void* aElement, void *aData); /// A basic zero-based array of void*'s that manages its own memory class NS_COM_GLUE nsVoidArray { @@ -202,7 +202,7 @@ protected: class nsString; -typedef int (* PR_CALLBACK nsStringArrayComparatorFunc) +typedef int (* nsStringArrayComparatorFunc) (const nsString* aElement1, const nsString* aElement2, void* aData); typedef PRBool (*nsStringArrayEnumFunc)(nsString& aElement, void *aData); @@ -256,7 +256,7 @@ private: class nsCString; -typedef int (* PR_CALLBACK nsCStringArrayComparatorFunc) +typedef int (* nsCStringArrayComparatorFunc) (const nsCString* aElement1, const nsCString* aElement2, void* aData); typedef PRBool (*nsCStringArrayEnumFunc)(nsCString& aElement, void *aData); diff --git a/xpcom/glue/pldhash.h b/xpcom/glue/pldhash.h index 54e7e49e1033..f118f83f3824 100644 --- a/xpcom/glue/pldhash.h +++ b/xpcom/glue/pldhash.h @@ -239,24 +239,24 @@ struct PLDHashTable { * equal to 0; but note that pldhash.c code will never call with 0 nbytes). */ typedef void * -(* PR_CALLBACK PLDHashAllocTable)(PLDHashTable *table, PRUint32 nbytes); +(* PLDHashAllocTable)(PLDHashTable *table, PRUint32 nbytes); typedef void -(* PR_CALLBACK PLDHashFreeTable) (PLDHashTable *table, void *ptr); +(* PLDHashFreeTable) (PLDHashTable *table, void *ptr); /* * Compute the hash code for a given key to be looked up, added, or removed * from table. A hash code may have any PLDHashNumber value. */ typedef PLDHashNumber -(* PR_CALLBACK PLDHashHashKey) (PLDHashTable *table, const void *key); +(* PLDHashHashKey) (PLDHashTable *table, const void *key); /* * Compare the key identifying entry in table with the provided key parameter. * Return PR_TRUE if keys match, PR_FALSE otherwise. */ typedef PRBool -(* PR_CALLBACK PLDHashMatchEntry)(PLDHashTable *table, +(* PLDHashMatchEntry)(PLDHashTable *table, const PLDHashEntryHdr *entry, const void *key); @@ -267,9 +267,9 @@ typedef PRBool * any reference-decrementing callback shortly. */ typedef void -(* PR_CALLBACK PLDHashMoveEntry)(PLDHashTable *table, - const PLDHashEntryHdr *from, - PLDHashEntryHdr *to); +(* PLDHashMoveEntry)(PLDHashTable *table, + const PLDHashEntryHdr *from, + PLDHashEntryHdr *to); /* * Clear the entry and drop any strong references it holds. This callback is @@ -277,8 +277,8 @@ typedef void * but only if the given key is found in the table. */ typedef void -(* PR_CALLBACK PLDHashClearEntry)(PLDHashTable *table, - PLDHashEntryHdr *entry); +(* PLDHashClearEntry)(PLDHashTable *table, + PLDHashEntryHdr *entry); /* * Called when a table (whether allocated dynamically by itself, or nested in @@ -286,7 +286,7 @@ typedef void * allows table->ops-specific code to finalize table->data. */ typedef void -(* PR_CALLBACK PLDHashFinalize) (PLDHashTable *table); +(* PLDHashFinalize) (PLDHashTable *table); /* * Initialize a new entry, apart from keyHash. This function is called when @@ -296,9 +296,9 @@ typedef void * table. */ typedef PRBool -(* PR_CALLBACK PLDHashInitEntry)(PLDHashTable *table, - PLDHashEntryHdr *entry, - const void *key); +(* PLDHashInitEntry)(PLDHashTable *table, + PLDHashEntryHdr *entry, + const void *key); /* * Finally, the "vtable" structure for PLDHashTable. The first eight hooks @@ -575,7 +575,7 @@ PL_DHashTableRawRemove(PLDHashTable *table, PLDHashEntryHdr *entry); * the entry being enumerated, rather than returning PL_DHASH_REMOVE. */ typedef PLDHashOperator -(* PR_CALLBACK PLDHashEnumerator)(PLDHashTable *table, PLDHashEntryHdr *hdr, +(* PLDHashEnumerator)(PLDHashTable *table, PLDHashEntryHdr *hdr, PRUint32 number, void *arg); NS_COM_GLUE PRUint32 diff --git a/xpcom/io/nsDirectoryService.h b/xpcom/io/nsDirectoryService.h index 10979e5d6ea8..adad900271e0 100644 --- a/xpcom/io/nsDirectoryService.h +++ b/xpcom/io/nsDirectoryService.h @@ -80,7 +80,7 @@ class nsDirectoryService : public nsIDirectoryService, private: nsresult GetCurrentProcessDirectory(nsILocalFile** aFile); - static PRBool PR_CALLBACK ReleaseValues(nsHashKey* key, void* data, void* closure); + static PRBool ReleaseValues(nsHashKey* key, void* data, void* closure); nsSupportsHashtable mHashtable; nsCOMPtr mProviders; diff --git a/xpcom/io/nsFastLoadFile.cpp b/xpcom/io/nsFastLoadFile.cpp index 1c62e8f301c1..b9797063fe4b 100644 --- a/xpcom/io/nsFastLoadFile.cpp +++ b/xpcom/io/nsFastLoadFile.cpp @@ -326,7 +326,7 @@ struct nsDocumentMapReadEntry : public nsDocumentMapEntry { // mux schedule }; -PR_STATIC_CALLBACK(void) +static void strmap_ClearEntry(PLDHashTable *aTable, PLDHashEntryHdr *aHdr) { nsStringMapEntry* entry = static_cast(aHdr); @@ -360,7 +360,7 @@ struct nsURIMapReadEntry : public nsObjectMapEntry { nsDocumentMapReadEntry* mDocMapEntry; }; -PR_STATIC_CALLBACK(void) +static void objmap_ClearEntry(PLDHashTable *aTable, PLDHashEntryHdr *aHdr) { nsObjectMapEntry* entry = static_cast(aHdr); @@ -1245,7 +1245,7 @@ struct nsIDMapEntry : public PLDHashEntryHdr { nsID mSlowID; // key, used by PLDHashTableOps below }; -PR_STATIC_CALLBACK(PLDHashNumber) +static PLDHashNumber idmap_HashKey(PLDHashTable *aTable, const void *aKey) { const nsID *idp = reinterpret_cast(aKey); @@ -1253,7 +1253,7 @@ idmap_HashKey(PLDHashTable *aTable, const void *aKey) return idp->m0; } -PR_STATIC_CALLBACK(PRBool) +static PRBool idmap_MatchEntry(PLDHashTable *aTable, const PLDHashEntryHdr *aHdr, const void *aKey) @@ -1723,7 +1723,7 @@ nsFastLoadFileWriter::WriteMuxedDocumentInfo(const nsFastLoadMuxedDocumentInfo& return NS_OK; } -PLDHashOperator PR_CALLBACK +PLDHashOperator nsFastLoadFileWriter::IDMapEnumerate(PLDHashTable *aTable, PLDHashEntryHdr *aHdr, PRUint32 aNumber, @@ -1743,7 +1743,7 @@ struct nsSharpObjectMapEntry : public nsObjectMapEntry { nsFastLoadSharpObjectInfo mInfo; }; -PLDHashOperator PR_CALLBACK +PLDHashOperator nsFastLoadFileWriter::ObjectMapEnumerate(PLDHashTable *aTable, PLDHashEntryHdr *aHdr, PRUint32 aNumber, @@ -1767,7 +1767,7 @@ nsFastLoadFileWriter::ObjectMapEnumerate(PLDHashTable *aTable, return PL_DHASH_NEXT; } -PLDHashOperator PR_CALLBACK +PLDHashOperator nsFastLoadFileWriter::DocumentMapEnumerate(PLDHashTable *aTable, PLDHashEntryHdr *aHdr, PRUint32 aNumber, @@ -1787,7 +1787,7 @@ nsFastLoadFileWriter::DocumentMapEnumerate(PLDHashTable *aTable, return NS_FAILED(*rvp) ? PL_DHASH_STOP : PL_DHASH_NEXT; } -PLDHashOperator PR_CALLBACK +PLDHashOperator nsFastLoadFileWriter::DependencyMapEnumerate(PLDHashTable *aTable, PLDHashEntryHdr *aHdr, PRUint32 aNumber, @@ -2336,7 +2336,7 @@ nsFastLoadFileUpdater::GetOutputStream(nsIOutputStream** aResult) return NS_OK; } -PLDHashOperator PR_CALLBACK +PLDHashOperator nsFastLoadFileUpdater::CopyReadDocumentMapEntryToUpdater(PLDHashTable *aTable, PLDHashEntryHdr *aHdr, PRUint32 aNumber, diff --git a/xpcom/io/nsFastLoadFile.h b/xpcom/io/nsFastLoadFile.h index fa2fc81783a8..b8e87dd69947 100644 --- a/xpcom/io/nsFastLoadFile.h +++ b/xpcom/io/nsFastLoadFile.h @@ -485,25 +485,25 @@ class nsFastLoadFileWriter PRBool aIsStrongRef, PRUint32 aQITag); - static PLDHashOperator PR_CALLBACK + static PLDHashOperator IDMapEnumerate(PLDHashTable *aTable, PLDHashEntryHdr *aHdr, PRUint32 aNumber, void *aData); - static PLDHashOperator PR_CALLBACK + static PLDHashOperator ObjectMapEnumerate(PLDHashTable *aTable, PLDHashEntryHdr *aHdr, PRUint32 aNumber, void *aData); - static PLDHashOperator PR_CALLBACK + static PLDHashOperator DocumentMapEnumerate(PLDHashTable *aTable, PLDHashEntryHdr *aHdr, PRUint32 aNumber, void *aData); - static PLDHashOperator PR_CALLBACK + static PLDHashOperator DependencyMapEnumerate(PLDHashTable *aTable, PLDHashEntryHdr *aHdr, PRUint32 aNumber, @@ -561,7 +561,7 @@ class nsFastLoadFileUpdater nsresult Open(nsFastLoadFileReader* aReader); NS_IMETHOD Close(); - static PLDHashOperator PR_CALLBACK + static PLDHashOperator CopyReadDocumentMapEntryToUpdater(PLDHashTable *aTable, PLDHashEntryHdr *aHdr, PRUint32 aNumber, diff --git a/xpcom/io/nsLocalFileOS2.cpp b/xpcom/io/nsLocalFileOS2.cpp index e6d29bb77003..2cd256d3745c 100644 --- a/xpcom/io/nsLocalFileOS2.cpp +++ b/xpcom/io/nsLocalFileOS2.cpp @@ -133,7 +133,7 @@ myLL_L2II(PRInt64 result, PRInt32 *hi, PRInt32 *lo ) } // Locates the first occurrence of charToSearchFor in the stringToSearch -static unsigned char* PR_CALLBACK +static unsigned char* _mbschr(const unsigned char* stringToSearch, int charToSearchFor) { const unsigned char* p = stringToSearch; @@ -149,7 +149,7 @@ _mbschr(const unsigned char* stringToSearch, int charToSearchFor) } // Locates the first occurrence of subString in the stringToSearch -static unsigned char* PR_CALLBACK +static unsigned char* _mbsstr(const unsigned char* stringToSearch, const unsigned char* subString) { const unsigned char* pStr = stringToSearch; @@ -198,7 +198,7 @@ _mbsrchr(const unsigned char* stringToSearch, int charToSearchFor) } // Implement equivalent of Win32 CreateDirectoryA -static nsresult PR_CALLBACK +static nsresult CreateDirectoryA(PSZ path, PEAOP2 ppEABuf) { APIRET rc; diff --git a/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp b/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp index d64fbffc283b..90fb9a7defda 100644 --- a/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp +++ b/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp @@ -649,7 +649,7 @@ struct SortData xptiWorkingSet* mWorkingSet; }; -PR_STATIC_CALLBACK(int) +static int xptiSortFileList(const void * p1, const void *p2, void * closure) { nsILocalFile* pFile1 = *((nsILocalFile**) p1); @@ -1358,7 +1358,7 @@ struct TwoWorkingSets xptiWorkingSet* aDestWorkingSet; }; -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator xpti_Merger(PLDHashTable *table, PLDHashEntryHdr *hdr, PRUint32 number, void *arg) { @@ -1632,7 +1632,7 @@ xptiInterfaceInfoManager::WriteToLog(const char *fmt, ...) } } -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator xpti_ResolvedFileNameLogger(PLDHashTable *table, PLDHashEntryHdr *hdr, PRUint32 number, void *arg) { @@ -1809,7 +1809,7 @@ NS_IMETHODIMP xptiInterfaceInfoManager::GetNameForIID(const nsIID * iid, char ** return entry->GetName(_retval); } -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator xpti_ArrayAppender(PLDHashTable *table, PLDHashEntryHdr *hdr, PRUint32 number, void *arg) { @@ -1847,7 +1847,7 @@ struct ArrayAndPrefix PRUint32 length; }; -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator xpti_ArrayPrefixAppender(PLDHashTable *table, PLDHashEntryHdr *hdr, PRUint32 number, void *arg) { diff --git a/xpcom/reflect/xptinfo/src/xptiManifest.cpp b/xpcom/reflect/xptinfo/src/xptiManifest.cpp index 94dd1414a4e2..0ead2f588915 100644 --- a/xpcom/reflect/xptinfo/src/xptiManifest.cpp +++ b/xpcom/reflect/xptinfo/src/xptiManifest.cpp @@ -89,7 +89,7 @@ CurrentAppDirMatchesPersistentDescriptor(xptiInterfaceInfoManager* aMgr, return NS_SUCCEEDED(rv) && matches; } -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator xpti_InterfaceWriter(PLDHashTable *table, PLDHashEntryHdr *hdr, PRUint32 number, void *arg) { diff --git a/xpcom/reflect/xptinfo/src/xptiWorkingSet.cpp b/xpcom/reflect/xptinfo/src/xptiWorkingSet.cpp index 4ee82e792bc9..7b4272a6e2d9 100644 --- a/xpcom/reflect/xptinfo/src/xptiWorkingSet.cpp +++ b/xpcom/reflect/xptinfo/src/xptiWorkingSet.cpp @@ -48,13 +48,13 @@ /***************************************************************************/ -PR_STATIC_CALLBACK(PLDHashNumber) +static PLDHashNumber IIDHash(PLDHashTable *table, const void *key) { return (PLDHashNumber) ((const nsIID*)key)->m0; } -PR_STATIC_CALLBACK(PRBool) +static PRBool IIDMatch(PLDHashTable *table, const PLDHashEntryHdr *entry, const void *key) @@ -78,7 +78,7 @@ const static struct PLDHashTableOps IIDTableOps = /***************************************************************************/ -PR_STATIC_CALLBACK(PRBool) +static PRBool NameMatch(PLDHashTable *table, const PLDHashEntryHdr *entry, const void *key) @@ -135,14 +135,14 @@ xptiWorkingSet::IsValid() const mIIDTable; } -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator xpti_Remover(PLDHashTable *table, PLDHashEntryHdr *hdr, PRUint32 number, void *arg) { return PL_DHASH_REMOVE; } -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator xpti_Invalidator(PLDHashTable *table, PLDHashEntryHdr *hdr, PRUint32 number, void *arg) { diff --git a/xpcom/tests/TestAutoLock.cpp b/xpcom/tests/TestAutoLock.cpp index 4537044f3667..6f549b2e87a7 100644 --- a/xpcom/tests/TestAutoLock.cpp +++ b/xpcom/tests/TestAutoLock.cpp @@ -47,7 +47,7 @@ PRLock* gLock; int gCount; -static void PR_CALLBACK run(void* arg) +static void run(void* arg) { for (int i = 0; i < 1000000; ++i) { nsAutoLock guard(gLock); diff --git a/xpcom/tests/TestThreads.cpp b/xpcom/tests/TestThreads.cpp index 3f12cca748e7..812fc7ba198a 100644 --- a/xpcom/tests/TestThreads.cpp +++ b/xpcom/tests/TestThreads.cpp @@ -172,7 +172,7 @@ static int Stress(int loops, int threads) return 0; } -PR_STATIC_CALLBACK(void) threadProc(void *arg) +static void threadProc(void *arg) { // printf(" running thread %d\n", (int) arg); PR_Sleep(1); diff --git a/xpcom/threads/nsThread.h b/xpcom/threads/nsThread.h index 69764c3baa9b..4ad1032d17b5 100644 --- a/xpcom/threads/nsThread.h +++ b/xpcom/threads/nsThread.h @@ -82,7 +82,7 @@ private: PRBool ShuttingDown() { return mShutdownContext != nsnull; } - PR_STATIC_CALLBACK(void) ThreadFunc(void *arg); + static void ThreadFunc(void *arg); // Helper already_AddRefed GetObserver() { diff --git a/xpcom/threads/nsThreadManager.cpp b/xpcom/threads/nsThreadManager.cpp index d06171ea488a..19ddd19c6ea1 100644 --- a/xpcom/threads/nsThreadManager.cpp +++ b/xpcom/threads/nsThreadManager.cpp @@ -47,13 +47,13 @@ typedef nsTArray< nsRefPtr > nsThreadArray; //----------------------------------------------------------------------------- -PR_STATIC_CALLBACK(void) +static void ReleaseObject(void *data) { static_cast(data)->Release(); } -PR_STATIC_CALLBACK(PLDHashOperator) +static PLDHashOperator AppendAndRemoveThread(const void *key, nsRefPtr &thread, void *arg) { nsThreadArray *threads = static_cast(arg); diff --git a/xpfe/appshell/src/nsAppShellFactory.cpp b/xpfe/appshell/src/nsAppShellFactory.cpp index 8a41c233ac29..193cc05ab72f 100644 --- a/xpfe/appshell/src/nsAppShellFactory.cpp +++ b/xpfe/appshell/src/nsAppShellFactory.cpp @@ -71,13 +71,13 @@ static const nsModuleComponentInfo gAppShellModuleInfo[] = } }; -PR_STATIC_CALLBACK(nsresult) +static nsresult nsAppShellModuleConstructor(nsIModule *aModule) { return nsChromeTreeOwner::InitGlobals(); } -PR_STATIC_CALLBACK(void) +static void nsAppShellModuleDestructor(nsIModule *aModule) { nsChromeTreeOwner::FreeGlobals(); diff --git a/xpfe/appshell/src/nsWebShellWindow.cpp b/xpfe/appshell/src/nsWebShellWindow.cpp index b3243a3db4b8..8ee806057e5e 100644 --- a/xpfe/appshell/src/nsWebShellWindow.cpp +++ b/xpfe/appshell/src/nsWebShellWindow.cpp @@ -300,7 +300,7 @@ nsWebShellWindow::Toolbar() * This function is called to process events for the nsIWidget of the * nsWebShellWindow... */ -nsEventStatus PR_CALLBACK +nsEventStatus nsWebShellWindow::HandleEvent(nsGUIEvent *aEvent) { nsEventStatus result = nsEventStatus_eIgnore; diff --git a/xpfe/appshell/src/nsWebShellWindow.h b/xpfe/appshell/src/nsWebShellWindow.h index 73c9e3447077..a12507cafc91 100644 --- a/xpfe/appshell/src/nsWebShellWindow.h +++ b/xpfe/appshell/src/nsWebShellWindow.h @@ -86,7 +86,7 @@ protected: void LoadContentAreas(); PRBool ExecuteCloseHandler(); - static nsEventStatus PR_CALLBACK HandleEvent(nsGUIEvent *aEvent); + static nsEventStatus HandleEvent(nsGUIEvent *aEvent); nsCOMPtr mSPTimer; PRLock * mSPTimerLock; diff --git a/xpfe/components/history/src/nsGlobalHistory.cpp b/xpfe/components/history/src/nsGlobalHistory.cpp index 07a7e8272cc5..76ce1c2dd665 100644 --- a/xpfe/components/history/src/nsGlobalHistory.cpp +++ b/xpfe/components/history/src/nsGlobalHistory.cpp @@ -4358,7 +4358,7 @@ nsGlobalHistory::AutoCompleteCompare(nsAString& aHistoryURL, return StringBeginsWith(aHistoryURL, aUserURL); } -int PR_CALLBACK +int nsGlobalHistory::AutoCompleteSortComparison(nsIMdbRow* row1, nsIMdbRow* row2, void* closureVoid) { diff --git a/xpfe/components/history/src/nsGlobalHistory.h b/xpfe/components/history/src/nsGlobalHistory.h index ee609cf027f5..9f4bd9c4fe06 100644 --- a/xpfe/components/history/src/nsGlobalHistory.h +++ b/xpfe/components/history/src/nsGlobalHistory.h @@ -230,7 +230,7 @@ protected: PRBool AutoCompleteCompare(nsAString& aHistoryURL, const nsAString& aUserURL, AutocompleteExclude* aExclude); - PR_STATIC_CALLBACK(int) + static int AutoCompleteSortComparison(nsIMdbRow* v1, nsIMdbRow* v2, void *unused); // AutoCompleteSortClosure - used to pass info into diff --git a/xpfe/components/intl/nsCharsetMenu.cpp b/xpfe/components/intl/nsCharsetMenu.cpp index 4cde09d0ef05..27596e5b48c4 100644 --- a/xpfe/components/intl/nsCharsetMenu.cpp +++ b/xpfe/components/intl/nsCharsetMenu.cpp @@ -355,7 +355,7 @@ struct charsetMenuSortRecord { }; -static int PR_CALLBACK CompareMenuItems(const void* aArg1, const void* aArg2, void *data) +static int CompareMenuItems(const void* aArg1, const void* aArg2, void *data) { PRInt32 res; nsICollation * collation = (nsICollation *) data; diff --git a/xpfe/components/windowds/nsWindowDataSource.cpp b/xpfe/components/windowds/nsWindowDataSource.cpp index c5f0824e7f4a..4cde66c46fad 100644 --- a/xpfe/components/windowds/nsWindowDataSource.cpp +++ b/xpfe/components/windowds/nsWindowDataSource.cpp @@ -312,7 +312,7 @@ struct findWindowClosure { nsIXULWindow *resultWindow; }; -PR_STATIC_CALLBACK(PRBool) +static PRBool findWindow(nsHashKey* aKey, void *aData, void* aClosure) { nsVoidKey *thisKey = static_cast(aKey); diff --git a/xpinstall/src/nsJSInstallTriggerGlobal.cpp b/xpinstall/src/nsJSInstallTriggerGlobal.cpp index 5dc6f1c6f427..447a99464a5f 100644 --- a/xpinstall/src/nsJSInstallTriggerGlobal.cpp +++ b/xpinstall/src/nsJSInstallTriggerGlobal.cpp @@ -78,7 +78,7 @@ void ConvertJSValToStr(nsString& aString, } } -PR_STATIC_CALLBACK(void) +static void FinalizeInstallTriggerGlobal(JSContext *cx, JSObject *obj); /***********************************************************************/