Exporting symbols for the mac.

xpcom/ds/nsConjoiningEnumerator.cpp

@@ -147,7 +147,7 @@ nsConjoiningEnumerator::Prev(void)
 
 ////////////////////////////////////////////////////////////////////////////////
 
-NS_COM nsresult
+extern "C" NS_COM nsresult
 NS_NewConjoiningEnumerator(nsIEnumerator* first, nsIEnumerator* second,
                            nsIBidirectionalEnumerator* *aInstancePtrResult)
 {
@@ -292,7 +292,7 @@ nsIntersectionEnumerator::IsDone(void)
 
 ////////////////////////////////////////////////////////////////////////////////
 
-NS_COM nsresult
+extern "C" NS_COM nsresult
 NS_NewIntersectionEnumerator(nsIEnumerator* first, nsIEnumerator* second,
                       nsIEnumerator* *aInstancePtrResult)
 {
@@ -409,7 +409,7 @@ nsUnionEnumerator::IsDone(void)
 
 ////////////////////////////////////////////////////////////////////////////////
 
-NS_COM nsresult
+extern "C" NS_COM nsresult
 NS_NewUnionEnumerator(nsIEnumerator* first, nsIEnumerator* second,
                       nsIEnumerator* *aInstancePtrResult)
 {

xpcom/ds/nsIEnumerator.h

@@ -82,21 +82,21 @@ public:
 // enumerator lets you string together two other enumerators into one sequence.
 // The result is an nsIBidirectionalEnumerator, but if either input is not
 // also bidirectional, the Last and Prev operations will fail.
-extern NS_COM nsresult
+extern "C" NS_COM nsresult
 NS_NewConjoiningEnumerator(nsIEnumerator* first, nsIEnumerator* second,
                            nsIBidirectionalEnumerator* *aInstancePtrResult);
 
 // Construct and return an implementation of a "union enumerator." This
 // enumerator will only return elements that are found in both constituent
 // enumerators.
-extern NS_COM nsresult
+extern "C" NS_COM nsresult
 NS_NewUnionEnumerator(nsIEnumerator* first, nsIEnumerator* second,
                       nsIEnumerator* *aInstancePtrResult);
 
 // Construct and return an implementation of an "intersection enumerator." This
 // enumerator will return elements that are found in either constituent
 // enumerators, eliminating duplicates.
-extern NS_COM nsresult
+extern "C" NS_COM nsresult
 NS_NewIntersectionEnumerator(nsIEnumerator* first, nsIEnumerator* second,
                              nsIEnumerator* *aInstancePtrResult);
 

xpcom/macbuild/xpcom.exp

@@ -49,6 +49,9 @@ Abort__7nsDebugFPCci		# nsDebug::Abort(const char*,int)
 #__vc__17SupportsArrayImplCFi		# SupportsArrayImpl::operator [](int) const
 #AppendElement__17SupportsArrayImplFP11nsISupports		# SupportsArrayImpl::AppendElement(nsISupports*)
 NS_NewISupportsArray__FPP16nsISupportsArray		# NS_NewISupportsArray(nsISupportsArray**)
+NS_NewUnionEnumerator
+NS_NewIntersectionEnumerator
+NS_NewConjoiningEnumerator
 #EnumerateBackwards__17SupportsArrayImplFPFP11nsISupportsPv_iPv		# SupportsArrayImpl::EnumerateBackwards(int (*)(nsISupports*, void*),void*)
 #EnumerateForwards__17SupportsArrayImplFPFP11nsISupportsPv_iPv		# SupportsArrayImpl::EnumerateForwards(int (*)(nsISupports*, void*),void*)
 #Compact__17SupportsArrayImplFv		# SupportsArrayImpl::Compact()

xpcom/public/nsIEnumerator.h

@@ -82,21 +82,21 @@ public:
 // enumerator lets you string together two other enumerators into one sequence.
 // The result is an nsIBidirectionalEnumerator, but if either input is not
 // also bidirectional, the Last and Prev operations will fail.
-extern NS_COM nsresult
+extern "C" NS_COM nsresult
 NS_NewConjoiningEnumerator(nsIEnumerator* first, nsIEnumerator* second,
                            nsIBidirectionalEnumerator* *aInstancePtrResult);
 
 // Construct and return an implementation of a "union enumerator." This
 // enumerator will only return elements that are found in both constituent
 // enumerators.
-extern NS_COM nsresult
+extern "C" NS_COM nsresult
 NS_NewUnionEnumerator(nsIEnumerator* first, nsIEnumerator* second,
                       nsIEnumerator* *aInstancePtrResult);
 
 // Construct and return an implementation of an "intersection enumerator." This
 // enumerator will return elements that are found in either constituent
 // enumerators, eliminating duplicates.
-extern NS_COM nsresult
+extern "C" NS_COM nsresult
 NS_NewIntersectionEnumerator(nsIEnumerator* first, nsIEnumerator* second,
                              nsIEnumerator* *aInstancePtrResult);
 

xpcom/src/nsConjoiningEnumerator.cpp

@@ -147,7 +147,7 @@ nsConjoiningEnumerator::Prev(void)
 
 ////////////////////////////////////////////////////////////////////////////////
 
-NS_COM nsresult
+extern "C" NS_COM nsresult
 NS_NewConjoiningEnumerator(nsIEnumerator* first, nsIEnumerator* second,
                            nsIBidirectionalEnumerator* *aInstancePtrResult)
 {
@@ -292,7 +292,7 @@ nsIntersectionEnumerator::IsDone(void)
 
 ////////////////////////////////////////////////////////////////////////////////
 
-NS_COM nsresult
+extern "C" NS_COM nsresult
 NS_NewIntersectionEnumerator(nsIEnumerator* first, nsIEnumerator* second,
                       nsIEnumerator* *aInstancePtrResult)
 {
@@ -409,7 +409,7 @@ nsUnionEnumerator::IsDone(void)
 
 ////////////////////////////////////////////////////////////////////////////////
 
-NS_COM nsresult
+extern "C" NS_COM nsresult
 NS_NewUnionEnumerator(nsIEnumerator* first, nsIEnumerator* second,
                       nsIEnumerator* *aInstancePtrResult)
 {