Bug 1431030 - Ignore the automatic formatting of the NS_NPAPIPLUGIN_CALLBACK definitions r=jimm

MozReview-Commit-ID: 2oTHhb2VBWX

--HG--
extra : rebase_source : 79819bd1e4fd7d8b94f5ccf056749e3ac6f63925

dom/plugins/base/nsNPAPIPlugin.h

@@ -14,11 +14,14 @@
 #include "mozilla/PluginLibrary.h"
 #include "mozilla/RefCounted.h"
 
+// clang-format off
+// See bug 1431030
 #if defined(XP_WIN)
 #define NS_NPAPIPLUGIN_CALLBACK(_type, _name) _type (__stdcall * _name)
 #else
 #define NS_NPAPIPLUGIN_CALLBACK(_type, _name) _type (* _name)
 #endif
+// clang-format on
 
 typedef NS_NPAPIPLUGIN_CALLBACK(NPError, NP_GETENTRYPOINTS) (NPPluginFuncs* pCallbacks);
 typedef NS_NPAPIPLUGIN_CALLBACK(NPError, NP_PLUGININIT) (const NPNetscapeFuncs* pCallbacks);

dom/xslt/xpath/moz.build

@@ -14,7 +14,6 @@ UNIFIED_SOURCES += [
     'txBooleanExpr.cpp',
     'txBooleanResult.cpp',
     'txCoreFunctionCall.cpp',
-    'txErrorExpr.cpp',
     'txExpr.cpp',
     'txExprLexer.cpp',
     'txExprParser.cpp',

dom/xslt/xpath/txExpr.h

@@ -1002,27 +1002,6 @@ private:
     txOwningArray<txNodeTest> mNodeTests;
 };
 
-/**
- *  Expression that failed to parse
- */
-class txErrorExpr : public Expr
-{
-public:
-#ifdef TX_TO_STRING
-    explicit txErrorExpr(const nsAString& aStr)
-      : mStr(aStr)
-    {
-    }
-#endif
-
-    TX_DECL_EXPR
-
-#ifdef TX_TO_STRING
-private:
-    nsString mStr;
-#endif
-};
-
 #endif