Mercurial Mercurial > upstream > oracle > userland-gate / file revision
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/desktop/thunderbird/patches/firefox31-gnu-105-lz4-restrict-keyword.patch
author Stacy Yeh <stacy.yeh@oracle.com>
Mon, 11 Jan 2016 09:27:45 -0800
changeset 5255 cea0e462549a
permissions -rw-r--r--
22322082 Move Firefox/Thunderbird from Desktop consolidation to Userland

Correctly recognize the "restrict" keyword for the lz4.c file included in
Compression.cpp
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=57025

--- comm-esr31/mozilla/mfbt/lz4.c.orig	2015-06-04 11:17:03.957437771 -0700
+++ comm-esr31/mozilla/mfbt/lz4.c	2015-06-04 11:17:03.963371797 -0700
@@ -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 */
upstream/oracle/userland-gate