Updated liblzo2
This commit is contained in:
@@ -2,21 +2,7 @@
|
||||
|
||||
This file is part of the LZO real-time data compression library.
|
||||
|
||||
Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
|
||||
Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
|
||||
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-2015 Markus Franz Xaver Johannes Oberhumer
|
||||
All Rights Reserved.
|
||||
|
||||
The LZO library is free software; you can redistribute it and/or
|
||||
@@ -54,46 +40,21 @@ extern "C" {
|
||||
#endif
|
||||
|
||||
|
||||
/***********************************************************************
|
||||
// Integral types
|
||||
************************************************************************/
|
||||
|
||||
#if !defined(lzo_uintptr_t)
|
||||
# if (__LZO_MMODEL_HUGE)
|
||||
# define lzo_uintptr_t unsigned long
|
||||
# else
|
||||
# define lzo_uintptr_t acc_uintptr_t
|
||||
# ifdef __ACC_INTPTR_T_IS_POINTER
|
||||
# define __LZO_UINTPTR_T_IS_POINTER 1
|
||||
# endif
|
||||
# endif
|
||||
#endif
|
||||
|
||||
|
||||
/***********************************************************************
|
||||
//
|
||||
************************************************************************/
|
||||
|
||||
/* Always use the safe (=integral) version for pointer-comparisions.
|
||||
/* Always use the safe (=integral) version for pointer-comparisons.
|
||||
* The compiler should optimize away the additional casts anyway.
|
||||
*
|
||||
* Note that this only works if the representation and ordering
|
||||
* of the pointer and the integral is the same (at bit level).
|
||||
*
|
||||
* Most 16-bit compilers have their own view about pointers -
|
||||
* fortunately they don't care about comparing pointers
|
||||
* that are pointing to Nirvana.
|
||||
*/
|
||||
|
||||
#if (LZO_ARCH_I086)
|
||||
#define PTR(a) ((lzo_bytep) (a))
|
||||
/* only need the low bits of the pointer -> offset is ok */
|
||||
#define PTR_ALIGNED_4(a) ((ACC_PTR_FP_OFF(a) & 3) == 0)
|
||||
#define PTR_ALIGNED2_4(a,b) (((ACC_PTR_FP_OFF(a) | ACC_PTR_FP_OFF(b)) & 3) == 0)
|
||||
#error "LZO_ARCH_I086 is unsupported"
|
||||
#elif (LZO_MM_PVP)
|
||||
#define PTR(a) ((lzo_bytep) (a))
|
||||
#define PTR_ALIGNED_8(a) ((((lzo_uintptr_t)(a)) >> 61) == 0)
|
||||
#define PTR_ALIGNED2_8(a,b) ((((lzo_uintptr_t)(a)|(lzo_uintptr_t)(b)) >> 61) == 0)
|
||||
#error "LZO_MM_PVP is unsupported"
|
||||
#else
|
||||
#define PTR(a) ((lzo_uintptr_t) (a))
|
||||
#define PTR_LINEAR(a) PTR(a)
|
||||
@@ -125,20 +86,28 @@ typedef union
|
||||
unsigned long a_ulong;
|
||||
lzo_int a_lzo_int;
|
||||
lzo_uint a_lzo_uint;
|
||||
lzo_int32 a_lzo_int32;
|
||||
lzo_uint32 a_lzo_uint32;
|
||||
lzo_xint a_lzo_xint;
|
||||
lzo_int16_t a_lzo_int16_t;
|
||||
lzo_uint16_t a_lzo_uint16_t;
|
||||
lzo_int32_t a_lzo_int32_t;
|
||||
lzo_uint32_t a_lzo_uint32_t;
|
||||
#if defined(lzo_uint64_t)
|
||||
lzo_int64_t a_lzo_int64_t;
|
||||
lzo_uint64_t a_lzo_uint64_t;
|
||||
#endif
|
||||
size_t a_size_t;
|
||||
ptrdiff_t a_ptrdiff_t;
|
||||
lzo_uintptr_t a_lzo_uintptr_t;
|
||||
lzo_voidp a_lzo_voidp;
|
||||
void * a_void_p;
|
||||
lzo_bytep a_lzo_bytep;
|
||||
lzo_bytepp a_lzo_bytepp;
|
||||
lzo_uintp a_lzo_uintp;
|
||||
lzo_uint * a_lzo_uint_p;
|
||||
lzo_uint32p a_lzo_uint32p;
|
||||
lzo_uint32 * a_lzo_uint32_p;
|
||||
unsigned char * a_uchar_p;
|
||||
char * a_char_p;
|
||||
unsigned char * a_uchar_p;
|
||||
const void * a_c_void_p;
|
||||
const char * a_c_char_p;
|
||||
const unsigned char * a_c_uchar_p;
|
||||
lzo_voidp a_lzo_voidp;
|
||||
lzo_bytep a_lzo_bytep;
|
||||
const lzo_voidp a_c_lzo_voidp;
|
||||
const lzo_bytep a_c_lzo_bytep;
|
||||
}
|
||||
lzo_full_align_t;
|
||||
|
||||
@@ -150,7 +119,5 @@ lzo_full_align_t;
|
||||
|
||||
#endif /* already included */
|
||||
|
||||
/*
|
||||
vi:ts=4:et
|
||||
*/
|
||||
|
||||
/* vim:set ts=4 sw=4 et: */
|
||||
|
||||
Reference in New Issue
Block a user