On Tue, Jul 15, 2014 at 12:33 PM, Boris Faure <bill...@gmail.com> wrote:
> billiob pushed a commit to branch master.
>
> http://git.enlightenment.org/apps/terminology.git/commit/?id=3afe93fd71f4df7a6f64eb7286399496eb9be737
>
> commit 3afe93fd71f4df7a6f64eb7286399496eb9be737
> Author: Boris Faure <bill...@gmail.com>
> Date: Tue Jul 15 12:32:58 2014 +0200
>
> lz4: fix shadow variables, again…
Didn't you say upstream accepted your patch ?
> ---
> src/bin/lz4/lz4.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/src/bin/lz4/lz4.c b/src/bin/lz4/lz4.c
> index 482a8ed..b30d445 100644
> --- a/src/bin/lz4/lz4.c
> +++ b/src/bin/lz4/lz4.c
> @@ -986,9 +986,9 @@ FORCE_INLINE int LZ4_decompress_generic(
> copySize = length+MINMATCH - copySize;
> if (copySize > (size_t)((char*)op-dest)) /* overlap */
> {
> - BYTE* const cpy = op + copySize;
> - const BYTE* ref = (BYTE*)dest;
> - while (op < cpy) *op++ = *ref++;
> + BYTE* const cpy2 = op + copySize;
> + const BYTE* ref2 = (BYTE*)dest;
> + while (op < cpy2) *op++ = *ref2++;
> }
> else
> {
--
Cedric BAIL
------------------------------------------------------------------------------
Want fast and easy access to all the code in your enterprise? Index and
search up to 200,000 lines of code with a free copy of Black Duck
Code Sight - the same software that powers the world's largest code
search on Ohloh, the Black Duck Open Hub! Try it now.
http://p.sf.net/sfu/bds
_______________________________________________
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
