Bug 1431030 - Ignore the automatic formatting of the NS_NPAPIPLUGIN_CALLBACK definitions r?jimm draft
authorSylvestre Ledru <sledru@mozilla.com>
Wed, 17 Jan 2018 11:02:35 +0100
changeset 722096 cd11dae0ef328737089ef1fdf961dff1c7d4dc10
parent 720191 21ddfb9e6cc008e47da89db50e22697dc7b38635
child 746519 1a9c30a58d98bfff6b802e53e9ef1dcbd2fa4f3c
push id96044
push userbmo:sledru@mozilla.com
push dateThu, 18 Jan 2018 12:39:21 +0000
reviewersjimm
bugs1431030
milestone59.0a1
Bug 1431030 - Ignore the automatic formatting of the NS_NPAPIPLUGIN_CALLBACK definitions r?jimm MozReview-Commit-ID: 2oTHhb2VBWX
dom/plugins/base/nsNPAPIPlugin.h
--- a/dom/plugins/base/nsNPAPIPlugin.h
+++ b/dom/plugins/base/nsNPAPIPlugin.h
@@ -9,21 +9,24 @@
 #include "prlink.h"
 #include "npfunctions.h"
 #include "nsPluginHost.h"
 
 #include "mozilla/dom/ScriptSettings.h"
 #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);
 typedef NS_NPAPIPLUGIN_CALLBACK(NPError, NP_PLUGINUNIXINIT) (const NPNetscapeFuncs* pCallbacks, NPPluginFuncs* fCallbacks);
 typedef NS_NPAPIPLUGIN_CALLBACK(NPError, NP_PLUGINSHUTDOWN) ();
 
 // nsNPAPIPlugin is held alive both by active nsPluginTag instances and
 // by active nsNPAPIPluginInstance.