diff options
| author | Moonchild <moonchild@palemoon.org> | 2021-02-25 01:03:57 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2021-02-25 01:03:57 +0000 |
| commit | ceadffab6b357723981a429e11222daf6cd6dcfb (patch) | |
| tree | 5603053048d6a460f79b22bdf165fb74d32d39b0 /dom/plugins | |
| parent | 14fb2f966e9b54598c451e3cb35b4aa0480dafed (diff) | |
| parent | ad5a13bd501e379517da1a944c104a11d951a3f5 (diff) | |
| download | UXP-RC_20210225.tar UXP-RC_20210225.tar.gz UXP-RC_20210225.tar.lz UXP-RC_20210225.tar.xz UXP-RC_20210225.zip | |
Merge branch 'master' into releaseRC_20210225
Diffstat (limited to 'dom/plugins')
| -rw-r--r-- | dom/plugins/base/npapi.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/dom/plugins/base/npapi.h b/dom/plugins/base/npapi.h index e554aaabc..aa6a66b2b 100644 --- a/dom/plugins/base/npapi.h +++ b/dom/plugins/base/npapi.h @@ -46,7 +46,6 @@ #if defined(MOZ_X11) #include <X11/Xlib.h> #include <X11/Xutil.h> -#include "X11UndefineNone.h" #endif #endif @@ -269,12 +268,12 @@ typedef struct * the parameters to the Windows API IMMNotificationClient object. * This is the value of the NPNVaudioDeviceChangeDetails variable. */ -typedef struct _NPAudioDeviceChangeDetails
-{
- int32_t flow;
- int32_t role;
- const wchar_t* defaultDevice; // this pointer is only valid during the call
- // to NPPSetValue.
+typedef struct _NPAudioDeviceChangeDetails +{ + int32_t flow; + int32_t role; + const wchar_t* defaultDevice; // this pointer is only valid during the call + // to NPPSetValue. } NPAudioDeviceChangeDetails; #endif /* XP_WIN */ |