components/desktop/thunderbird/patches/firefox-34-lz4-restrict-keyword.patch
changeset 7018 fdf447a07aff
parent 7017 25872950aa80
child 7020 58ca1f0fa3a7
equal deleted inserted replaced
7017:25872950aa80 7018:fdf447a07aff
     1 Correctly recognize the "restrict" keyword for the lz4.c file included in
       
     2 Compression.cpp
       
     3 https://gcc.gnu.org/bugzilla/show_bug.cgi?id=57025
       
     4 
       
     5 diff --git a/mfbt/lz4.c b/mfbt/lz4.c
       
     6 --- a/mfbt/lz4.c
       
     7 +++ b/mfbt/lz4.c
       
     8 @@ -104,7 +104,7 @@
       
     9  /**************************************
       
    10   Compiler Options
       
    11  **************************************/
       
    12 -#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)   /* C99 */
       
    13 +#if defined(__STDC_VERSION__) && !defined(__cplusplus) && (__STDC_VERSION__ >= 199901L)   /* C99 */
       
    14  /* "restrict" is a known keyword */
       
    15  #else
       
    16  #  define restrict /* Disable restrict */