Fixing 280235. WinCE build stuff. r+sr=jst

dom/public/idl/events/nsIDOMNSEvent.idl

@@ -38,6 +38,12 @@
 
 #include "domstubs.idl"
 
+%{C++
+#ifdef WINCE
+#undef ERROR
+#endif
+%}
+
 [scriptable, uuid(e565d518-4510-407f-a3d9-3b4107549c6d)]
 interface nsIDOMNSEvent : nsISupports
 {

dom/src/base/nsJSEnvironment.cpp

@@ -106,9 +106,11 @@ static PRLogModuleInfo* gJSDiagnostics;
 #endif
 
 // Thank you Microsoft!
+#ifndef WINCE
 #ifdef CompareString
 #undef CompareString
 #endif
+#endif // WINCE
 
 #define NS_GC_DELAY                2000 // ms
 #define NS_FIRST_GC_DELAY          10000 // ms