equal
deleted
inserted
replaced
|
1 Define variables differently for Solaris. |
|
2 Do not plan to send upstream. |
|
3 |
|
4 diff --git a/toolkit/library/StaticXULComponentsEnd/StaticXULComponentsEnd.cpp b/toolkit/library/StaticXULComponentsEnd/StaticXULComponentsEnd.cpp |
|
5 --- a/toolkit/library/StaticXULComponentsEnd/StaticXULComponentsEnd.cpp |
|
6 +++ b/toolkit/library/StaticXULComponentsEnd/StaticXULComponentsEnd.cpp |
|
7 @@ -5,9 +5,10 @@ |
|
8 #ifdef _MSC_VER |
|
9 /* Sections on Windows are in two parts, separated with $. When linking, |
|
10 * sections with the same first part are all grouped, and ordered |
|
11 * alphabetically with the second part as sort key. */ |
|
12 # pragma section(".kPStaticModules$Z", read) |
|
13 # undef NSMODULE_SECTION |
|
14 # define NSMODULE_SECTION __declspec(allocate(".kPStaticModules$Z"), dllexport) |
|
15 #endif |
|
16 -NSMODULE_DEFN(end_kPStaticModules) = nullptr; |
|
17 +static const mozilla::Module kEndModule = { 0 }; |
|
18 +NSMODULE_DEFN(end_kPStaticModules) = &kEndModule; |
|
19 diff --git a/toolkit/library/StaticXULComponentsStart.cpp b/toolkit/library/StaticXULComponentsStart.cpp |
|
20 --- a/toolkit/library/StaticXULComponentsStart.cpp |
|
21 +++ b/toolkit/library/StaticXULComponentsStart.cpp |
|
22 @@ -1,3 +1,4 @@ |
|
23 #include "mozilla/Module.h" |
|
24 |
|
25 -NSMODULE_DEFN(start_kPStaticModules) = nullptr; |
|
26 +static const mozilla::Module kStartModule = { 0 }; |
|
27 +NSMODULE_DEFN(start_kPStaticModules) = &kStartModule; |