21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
22757279 Update Thunderbird to version 38.5.0
22613259 thunderbird lightning extension is missing l10n after moved to userland
21133062 problem in TBIRD/MAILER
Correctly recognize the "restrict" keyword for the lz4.c file included in
Compression.cpp
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=57025
diff --git a/mfbt/lz4.c b/mfbt/lz4.c
--- a/mfbt/lz4.c
+++ b/mfbt/lz4.c
@@ -104,7 +104,7 @@
/**************************************
Compiler Options
**************************************/
-#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */
+#if defined(__STDC_VERSION__) && !defined(__cplusplus) && (__STDC_VERSION__ >= 199901L) /* C99 */
/* "restrict" is a known keyword */
#else
# define restrict /* Disable restrict */