diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2014-06-27 12:46:41 -0700 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2017-06-29 10:43:01 +0000 |
| commit | 02ab5d34ba0a90e3b6dd78034d7c470c77500119 (patch) | |
| tree | 38bb0a5322576be2e308f673f11b22e56769bd1c /lzo/src/compr1c.h | |
| parent | f92b88bc6c65ba71dad92fe7da7b7085607b439a (diff) | |
| download | syslinux-02ab5d34ba0a90e3b6dd78034d7c470c77500119.tar.gz | |
lzo: Upgrade to LZO 2.07baserock/syslinux-4.06-gcc7
Use version 2.07 of the LZO compression library.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Backported to the Baserock syslinux 4.06 branch in order to fix
these compile failures with GCC 7 (part of the compiler detection
preprocessor magic):
In file included from src/lzo_init.c:61:0:
src/miniacc.h:4415:16: error: variably modified '__acc_cta' at file scope
ACCCHK_ASSERT((1 << (8*SIZEOF_INT-1)) < 0)
^~~~~~~~~
src/miniacc.h:4420:16: error: variably modified '__acc_cta' at file scope
ACCCHK_ASSERT((1l << (8*SIZEOF_LONG-1)) < 0)
^~~~~~~~~
In file included from src/lzo_init.c:61:0:
src/miniacc.h:4649:16: error: variably modified '__acc_cta' at file scope
ACCCHK_ASSERT( (((unsigned char)128) << (int)(8*sizeof(int)-8)) < 0)
^~~~~~~~~
../mk/build.mk:29: recipe for target 'src/lzo_init.o' failed
Diffstat (limited to 'lzo/src/compr1c.h')
| -rw-r--r-- | lzo/src/compr1c.h | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/lzo/src/compr1c.h b/lzo/src/compr1c.h index 8b29f9ae..566ba447 100644 --- a/lzo/src/compr1c.h +++ b/lzo/src/compr1c.h @@ -2,19 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2014 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or @@ -38,12 +26,12 @@ */ -#define LZO_NEED_DICT_H +#define LZO_NEED_DICT_H 1 #include "config1c.h" #if !defined(COMPRESS_ID) -#define COMPRESS_ID LZO_CPP_ECONCAT2(DD_BITS,CLEVEL) +#define COMPRESS_ID LZO_PP_ECONCAT2(DD_BITS,CLEVEL) #endif @@ -55,10 +43,10 @@ ************************************************************************/ #define LZO_COMPRESS \ - LZO_CPP_ECONCAT3(lzo1c_,COMPRESS_ID,_compress) + LZO_PP_ECONCAT3(lzo1c_,COMPRESS_ID,_compress) #define LZO_COMPRESS_FUNC \ - LZO_CPP_ECONCAT3(_lzo1c_,COMPRESS_ID,_compress_func) + LZO_PP_ECONCAT3(_lzo1c_,COMPRESS_ID,_compress_func) |