diff options
| author | Moonchild <moonchild@palemoon.org> | 2019-11-02 14:37:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-02 14:37:22 +0100 |
| commit | 21b3f6247403c06f85e1f45d219f87549862198f (patch) | |
| tree | 0038ae92f1cc7aaff0b55d6e5ac59efcc28bdf8f /toolkit/library/StaticXULComponentsEnd/StaticXULComponentsEnd.cpp | |
| parent | ff881bdb6795e0f307b93919f98f454bedde4bb6 (diff) | |
| parent | a9dc528a4a7b0aaad5308aff70963485ec3e9bec (diff) | |
| download | UXP-21b3f6247403c06f85e1f45d219f87549862198f.tar UXP-21b3f6247403c06f85e1f45d219f87549862198f.tar.gz UXP-21b3f6247403c06f85e1f45d219f87549862198f.tar.lz UXP-21b3f6247403c06f85e1f45d219f87549862198f.tar.xz UXP-21b3f6247403c06f85e1f45d219f87549862198f.zip | |
Merge pull request #1262 from athenian200/solaris-work
Support Modern Solaris
Diffstat (limited to 'toolkit/library/StaticXULComponentsEnd/StaticXULComponentsEnd.cpp')
| -rw-r--r-- | toolkit/library/StaticXULComponentsEnd/StaticXULComponentsEnd.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/toolkit/library/StaticXULComponentsEnd/StaticXULComponentsEnd.cpp b/toolkit/library/StaticXULComponentsEnd/StaticXULComponentsEnd.cpp index 28fd9d484..8b5b1f4cb 100644 --- a/toolkit/library/StaticXULComponentsEnd/StaticXULComponentsEnd.cpp +++ b/toolkit/library/StaticXULComponentsEnd/StaticXULComponentsEnd.cpp @@ -10,4 +10,7 @@ # undef NSMODULE_SECTION # define NSMODULE_SECTION __declspec(allocate(".kPStaticModules$Z"), dllexport) #endif -NSMODULE_DEFN(end_kPStaticModules) = nullptr; +/* This could be null, but this needs a dummy value to ensure it actually ends + * up in the same section as other NSMODULE_DEFNs, instead of being moved to a + * separate readonly section. */ +NSMODULE_DEFN(end_kPStaticModules) = (mozilla::Module*)&NSMODULE_NAME(end_kPStaticModules); |