Bug 1362338: followup: Tentatively fix windows build bustage. r=me
☠☠ backed out by 8808e9b8faf8 ☠ ☠
authorEmilio Cobos Álvarez <emilio@crisal.io>
Wed, 09 Aug 2017 14:45:37 +0200
changeset 373644 19b8d672b55da34fd6c090814111eac5ce40b298
parent 373643 8e991e3b80f610f1495bc562732a14b374a91a40
child 373645 535e762772079db364e730f336a068bfd2d6f875
push id32308
push userarchaeopteryx@coole-files.de
push dateThu, 10 Aug 2017 15:20:33 +0000
treeherdermozilla-central@5322c03f4c85 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1362338
milestone57.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1362338: followup: Tentatively fix windows build bustage. r=me Windows apparently uses __stdcall for this, so need to use the ugly macros... MozReview-Commit-ID: 4J27sCYwdHg
xpcom/ds/nsAtomTable.cpp
xpcom/ds/nsIAtom.idl
--- a/xpcom/ds/nsAtomTable.cpp
+++ b/xpcom/ds/nsAtomTable.cpp
@@ -270,28 +270,28 @@ StaticAtom::SizeOfIncludingThis(MallocSi
   size_t n = aMallocSizeOf(this);
   // Don't measure the string buffer pointed to by the StaticAtom because it's
   // in static memory.
   return n;
 }
 
 //----------------------------------------------------------------------
 
-MozExternalRefCountType
+NS_IMETHODIMP_(MozExternalRefCountType)
 nsIAtom::AddRef()
 {
   MOZ_ASSERT(!IsHTML5Atom(), "Attempt to AddRef an nsHtml5Atom");
   if (!IsDynamicAtom()) {
     MOZ_ASSERT(IsStaticAtom());
     return 2;
   }
   return static_cast<DynamicAtom*>(this)->DoAddRef();
 }
 
-MozExternalRefCountType
+NS_IMETHODIMP_(MozExternalRefCountType)
 nsIAtom::Release()
 {
   MOZ_ASSERT(!IsHTML5Atom(), "Attempt to Release an nsHtml5Atom");
   if (!IsDynamicAtom()) {
     MOZ_ASSERT(IsStaticAtom());
     return 1;
   }
   return static_cast<DynamicAtom*>(this)->DoRelease();
--- a/xpcom/ds/nsIAtom.idl
+++ b/xpcom/ds/nsIAtom.idl
@@ -90,18 +90,18 @@ interface nsIAtom : nsISupports
     nsStringBuffer::FromData(mString)->ToString(mLength, aBuf);
   }
 
   inline nsStringBuffer* GetStringBuffer() const {
     // See the comment on |mString|'s declaration.
     return nsStringBuffer::FromData(mString);
   }
 
-  MozExternalRefCountType AddRef() final;
-  MozExternalRefCountType Release() final;
+  NS_IMETHOD_(MozExternalRefCountType) AddRef() final;
+  NS_IMETHOD_(MozExternalRefCountType) Release() final;
 
   /**
    * A hashcode that is better distributed than the actual atom
    * pointer, for use in situations that need a well-distributed
    * hashcode.
    */
   inline uint32_t hash() const {
     return mHash;