5525N/ADefine variables differently for Solaris.

5525N/ADo not plan to send upstream.

5525N/A

5525N/Adiff --git a/toolkit/library/StaticXULComponentsEnd/StaticXULComponentsEnd.cpp b/toolkit/library/StaticXULComponentsEnd/StaticXULComponentsEnd.cpp

5525N/A--- a/toolkit/library/StaticXULComponentsEnd/StaticXULComponentsEnd.cpp

5525N/A+++ b/toolkit/library/StaticXULComponentsEnd/StaticXULComponentsEnd.cpp

5525N/A@@ -5,9 +5,10 @@

5525N/A #ifdef _MSC_VER

5525N/A /* Sections on Windows are in two parts, separated with $. When linking,

5525N/A * sections with the same first part are all grouped, and ordered

5525N/A * alphabetically with the second part as sort key. */

5525N/A # pragma section(".kPStaticModules$Z", read)

5525N/A # undef NSMODULE_SECTION

5525N/A # define NSMODULE_SECTION __declspec(allocate(".kPStaticModules$Z"), dllexport)

5525N/A #endif

5525N/A-NSMODULE_DEFN(end_kPStaticModules) = nullptr;

5525N/A+static const mozilla::Module kEndModule = { 0 };

5525N/A+NSMODULE_DEFN(end_kPStaticModules) = &kEndModule;

5525N/Adiff --git a/toolkit/library/StaticXULComponentsStart.cpp b/toolkit/library/StaticXULComponentsStart.cpp

5525N/A--- a/toolkit/library/StaticXULComponentsStart.cpp

5525N/A+++ b/toolkit/library/StaticXULComponentsStart.cpp

5525N/A@@ -1,3 +1,4 @@

5525N/A #include "mozilla/Module.h"

5525N/A

5525N/A-NSMODULE_DEFN(start_kPStaticModules) = nullptr;

5525N/A+static const mozilla::Module kStartModule = { 0 };

5525N/A+NSMODULE_DEFN(start_kPStaticModules) = &kStartModule;