diff --git a/mozilla/embedding/browser/photon/src/Makefile.in b/mozilla/embedding/browser/photon/src/Makefile.in
index 8df6b24382c..776c3ba2564 100644
--- a/mozilla/embedding/browser/photon/src/Makefile.in
+++ b/mozilla/embedding/browser/photon/src/Makefile.in
@@ -101,17 +101,6 @@ EXTRA_DSO_LDOPTS += $(MOZ_GTK_LDFLAGS)
 
 include $(topsrcdir)/config/rules.mk
 
-ifeq ($(OS_ARCH), SunOS)
-ifndef GNU_CC
-# When using Sun's WorkShop compiler, including
-# /wherever/workshop-5.0/SC5.0/include/CC/std/time.h
-# causes most of these compiles to fail with:
-# line 29: Error: Multiple declaration for std::tm.
-# So, this gets around the problem.
-DEFINES         += -D_TIME_H=1
-endif
-endif
-
 CXXFLAGS        += $(MOZ_GTK_CFLAGS)
 
 ifdef BUILD_STATIC_LIBS
diff --git a/mozilla/xpcom/tests/TestCOMPtr.cpp b/mozilla/xpcom/tests/TestCOMPtr.cpp
index bd8fdd4c0cc..9cffaa832c3 100644
--- a/mozilla/xpcom/tests/TestCOMPtr.cpp
+++ b/mozilla/xpcom/tests/TestCOMPtr.cpp
@@ -438,14 +438,11 @@ main()
 				// [Shouldn't compile] Is it a compile time error to try to |delete| an |nsCOMPtr|?
 			//delete foop;
 
-	  /* Solaris Workshop compiler fails to compile this. */
-#if !defined(XP_UNIX) || !(defined(SOLARIS) && !defined(__GNUG__))
       cout << endl << "### Test  3: can you |AddRef| if you must?" << endl;
       STATIC_CAST(IFoo*, foop)->AddRef();
 
       cout << endl << "### Test  4: can you |Release| if you must?" << endl;
       STATIC_CAST(IFoo*, foop)->Release();
-#endif
 
       cout << endl << "### Test  5: will a |nsCOMPtr| |Release| when it goes out of scope?" << endl;
     }