diff --git a/mozilla/js/src/xpconnect/src/xpcprivate.h b/mozilla/js/src/xpconnect/src/xpcprivate.h
index 88b2c332a65..3b67762fa13 100644
--- a/mozilla/js/src/xpconnect/src/xpcprivate.h
+++ b/mozilla/js/src/xpconnect/src/xpcprivate.h
@@ -2297,6 +2297,7 @@ public:
 
     // Make ctor and dtor protected (rather than private) to placate nsCOMPtr.
 protected:
+    XPCWrappedNative(); // not implemented
     XPCWrappedNative(nsISupports* aIdentity,
                      XPCWrappedNativeProto* aProto);
     virtual ~XPCWrappedNative();
diff --git a/mozilla/js/src/xpconnect/src/xpcwrappednativescope.cpp b/mozilla/js/src/xpconnect/src/xpcwrappednativescope.cpp
index bf692c9b312..b7cab808c9c 100644
--- a/mozilla/js/src/xpconnect/src/xpcwrappednativescope.cpp
+++ b/mozilla/js/src/xpconnect/src/xpcwrappednativescope.cpp
@@ -412,7 +412,7 @@ void DEBUG_CheckForComponentsInScope(XPCCallContext& ccx, JSObject* obj)
     "callback code."
     "\n";
 
-#ifdef IM_SO_SMART_THAT_I_NEVER_MAKE_MISTAKES
+#ifdef I_FOOLISHLY_WANT_TO_IGNORE_THIS_LIKE_THE_OTHER_CRAP_WE_PRINTF
     NS_WARNING(msg);
 #else
     NS_ERROR(msg);