# 37239

r = mkaply@us.ibm.com, a = brendan
OS/2 bringup continues on M16 - These files are OS/2 only - fix for trap

intl/locale/src/os2/nsDateTimeFormatOS2.cpp

@@ -32,7 +32,8 @@ static NS_DEFINE_IID(kILocaleOS2IID, NS_IOS2LOCALE_IID);
 static NS_DEFINE_IID(kIDateTimeFormatIID, NS_IDATETIMEFORMAT_IID);
 
 // nsISupports implementation
-NS_IMPL_ISUPPORTS(nsDateTimeFormatOS2,kIDateTimeFormatIID)
+// NS_IMPL_ISUPPORTS(nsDateTimeFormatOS2,kIDateTimeFormatIID)
+NS_IMPL_THREADSAFE_ISUPPORTS(nsDateTimeFormatOS2,kIDateTimeFormatIID)
 
 // ctor/dtor
 nsDateTimeFormatOS2::nsDateTimeFormatOS2()

intl/locale/src/os2/nsLocaleFactoryOS2.cpp

@@ -207,7 +207,7 @@ nsLocaleFactoryOS2::CreateInstance(nsISupports* aOuter, REFNSIID aIID,
   return ret;
 }
 
-nsresult nsLocaleFactoryOS2::QueryInterface(const nsIID &aIID,   
+/* nsresult nsLocaleFactoryOS2::QueryInterface(const nsIID &aIID,   
 					    void **aResult)   
 {   
   if (aResult == NULL) {   
@@ -230,7 +230,7 @@ nsresult nsLocaleFactoryOS2::QueryInterface(const nsIID &aIID,
 
   NS_ADDREF_THIS(); // Increase reference count for caller   
   return NS_OK;   
-}   
+}   */
 
 
 NS_IMETHODIMP
@@ -239,5 +239,4 @@ nsLocaleFactoryOS2::LockFactory(PRBool	aBool)
 	return NS_OK;
 }
 
-NS_IMPL_ADDREF(nsLocaleFactoryOS2);
-NS_IMPL_RELEASE(nsLocaleFactoryOS2);
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsLocaleFactoryOS2, nsIFactory);