components/desktop/thunderbird/patches/firefox-41-static-xul-components.patch
author Stacy Yeh <stacy.yeh@oracle.com>
Tue, 19 Jul 2016 14:15:23 -0700
changeset 6431 e4667e7df088
permissions -rw-r--r--
23601539 Update Thunderbird to version 45.1.0
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
6431
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
     1
Define variables differently for Solaris. 
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
     2
Do not plan to send upstream.
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
     3
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
     4
diff --git a/toolkit/library/StaticXULComponentsEnd/StaticXULComponentsEnd.cpp b/toolkit/library/StaticXULComponentsEnd/StaticXULComponentsEnd.cpp
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
     5
--- a/toolkit/library/StaticXULComponentsEnd/StaticXULComponentsEnd.cpp
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
     6
+++ b/toolkit/library/StaticXULComponentsEnd/StaticXULComponentsEnd.cpp
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
     7
@@ -5,9 +5,10 @@
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
     8
 #ifdef _MSC_VER
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
     9
 /* Sections on Windows are in two parts, separated with $. When linking,
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    10
  * sections with the same first part are all grouped, and ordered
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    11
  * alphabetically with the second part as sort key. */
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    12
 #  pragma section(".kPStaticModules$Z", read)
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    13
 #  undef NSMODULE_SECTION
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    14
 #  define NSMODULE_SECTION __declspec(allocate(".kPStaticModules$Z"), dllexport)
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    15
 #endif
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    16
-NSMODULE_DEFN(end_kPStaticModules) = nullptr;
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    17
+static const mozilla::Module kEndModule = { 0 };
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    18
+NSMODULE_DEFN(end_kPStaticModules) = &kEndModule;
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    19
diff --git a/toolkit/library/StaticXULComponentsStart.cpp b/toolkit/library/StaticXULComponentsStart.cpp
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    20
--- a/toolkit/library/StaticXULComponentsStart.cpp
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    21
+++ b/toolkit/library/StaticXULComponentsStart.cpp
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    22
@@ -1,3 +1,4 @@
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    23
 #include "mozilla/Module.h"
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    24
 
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    25
-NSMODULE_DEFN(start_kPStaticModules) = nullptr;
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    26
+static const mozilla::Module kStartModule = { 0 };
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    27
+NSMODULE_DEFN(start_kPStaticModules) = &kStartModule;