Thread: [Commits] : Tuxbox-GIT: hostapps branch master updated. CVS-Final-6-gad437c4
Tuxbox Sources
Brought to you by:
dbt1
Menu
▾
▴
tuxbox-cvs-commits
|
From: GetAway <tux...@ne...> - 2015-06-16 17:49:14
|
Project "Tuxbox-GIT: hostapps":
The branch, master has been updated
via ad437c4aff75065b686702ec46fe153e4ae1f038 (commit)
from ed90b09ee12f201b666c883cb01b55953e39ae51 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit ad437c4aff75065b686702ec46fe153e4ae1f038
Author: GetAway <get...@t-...>
Date: Tue Jun 16 19:34:32 2015 +0200
revert -> mkflfs: miniLZO update to version 2.09
u-boot does not work correctly when create a flashimage.
Signed-off-by: GetAway <get...@t-...>
diff --git a/mkflfs/README.LZO b/mkflfs/README.LZO
deleted file mode 100644
index b82d13b..0000000
--- a/mkflfs/README.LZO
+++ /dev/null
@@ -1,123 +0,0 @@
-
- ============================================================================
- miniLZO -- mini subset of the LZO real-time data compression library
- ============================================================================
-
- Author : Markus Franz Xaver Johannes Oberhumer
- <ma...@ob...>
- http://www.oberhumer.com/opensource/lzo/
- Version : 2.09
- Date : 04 Feb 2015
-
- I've created miniLZO for projects where it is inconvenient to
- include (or require) the full LZO source code just because you
- want to add a little bit of data compression to your application.
-
- miniLZO implements the LZO1X-1 compressor and both the standard and
- safe LZO1X decompressor. Apart from fast compression it also useful
- for situations where you want to use pre-compressed data files (which
- must have been compressed with LZO1X-999).
-
- miniLZO consists of one C source file and three header files:
- minilzo.c
- minilzo.h, lzoconf.h, lzodefs.h
-
- To use miniLZO just copy these files into your source directory, add
- minilzo.c to your Makefile and #include minilzo.h from your program.
- Note: you also must distribute this file ('README.LZO') with your project.
-
- minilzo.o compiles to about 6 KiB (using gcc or Visual C on an i386), and
- the sources are about 30 KiB when packed with zip - so there's no more
- excuse that your application doesn't support data compression :-)
-
- For more information, documentation, example programs and other support
- files (like Makefiles and build scripts) please download the full LZO
- package from
- http://www.oberhumer.com/opensource/lzo/
-
- Have fun,
- Markus
-
-
- P.S. minilzo.c is generated automatically from the LZO sources and
- therefore functionality is completely identical
-
-
- Appendix A: building miniLZO
- ----------------------------
- miniLZO is written such a way that it should compile and run
- out-of-the-box on most machines.
-
- If you are running on a very unusual architecture and lzo_init() fails then
- you should first recompile with '-DLZO_DEBUG' to see what causes the failure.
- The most probable case is something like 'sizeof(void *) != sizeof(size_t)'.
- After identifying the problem you can compile by adding some defines
- like '-DSIZEOF_VOID_P=8' to your Makefile.
-
- The best solution is (of course) using Autoconf - if your project uses
- Autoconf anyway just add '-DMINILZO_HAVE_CONFIG_H' to your compiler
- flags when compiling minilzo.c. See the LZO distribution for an example
- how to set up configure.ac.
-
-
- Appendix B: list of public functions available in miniLZO
- ---------------------------------------------------------
- Library initialization
- lzo_init()
-
- Compression
- lzo1x_1_compress()
-
- Decompression
- lzo1x_decompress()
- lzo1x_decompress_safe()
-
- Checksum functions
- lzo_adler32()
-
- Version functions
- lzo_version()
- lzo_version_string()
- lzo_version_date()
-
- Portable (but slow) string functions
- lzo_memcmp()
- lzo_memcpy()
- lzo_memmove()
- lzo_memset()
-
-
- Appendix C: suggested macros for 'configure.ac' when using Autoconf
- -------------------------------------------------------------------
- Checks for typedefs and structures
- AC_CHECK_TYPE(ptrdiff_t,long)
- AC_TYPE_SIZE_T
- AC_CHECK_SIZEOF(short)
- AC_CHECK_SIZEOF(int)
- AC_CHECK_SIZEOF(long)
- AC_CHECK_SIZEOF(long long)
- AC_CHECK_SIZEOF(__int64)
- AC_CHECK_SIZEOF(void *)
- AC_CHECK_SIZEOF(size_t)
- AC_CHECK_SIZEOF(ptrdiff_t)
-
- Checks for compiler characteristics
- AC_C_CONST
-
- Checks for library functions
- AC_CHECK_FUNCS(memcmp memcpy memmove memset)
-
-
- Appendix D: Copyright
- ---------------------
- LZO and miniLZO are Copyright (C) 1996-2015 Markus Franz Xaver Oberhumer
- All Rights Reserved.
-
- LZO and miniLZO are distributed under the terms of the GNU General
- Public License (GPL). See the file COPYING.
-
- Special licenses for commercial and other applications which
- are not willing to accept the GNU General Public License
- are available by contacting the author.
-
-
diff --git a/mkflfs/lzoconf.h b/mkflfs/lzoconf.h
index 64ef279..6120f62 100644
--- a/mkflfs/lzoconf.h
+++ b/mkflfs/lzoconf.h
@@ -1,9 +1,12 @@
-/* lzoconf.h -- configuration of the LZO data compression library
+/* lzoconf.h -- configuration for the LZO real-time data compression library
This file is part of the LZO real-time data compression library.
- Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
+ 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
The LZO library is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
@@ -18,27 +21,30 @@
You should have received a copy of the GNU General Public License
along with the LZO library; see the file COPYING.
If not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
Markus F.X.J. Oberhumer
- <ma...@ob...>
- http://www.oberhumer.com/opensource/lzo/
+ <mar...@jk...>
+ http://wildsau.idv.uni-linz.ac.at/mfx/lzo.html
*/
-#ifndef __LZOCONF_H_INCLUDED
-#define __LZOCONF_H_INCLUDED 1
+#ifndef __LZOCONF_H
+#define __LZOCONF_H
-#define LZO_VERSION 0x2090
-#define LZO_VERSION_STRING "2.09"
-#define LZO_VERSION_DATE "Feb 04 2015"
+#define LZO_VERSION 0x1070
+#define LZO_VERSION_STRING "1.07"
+#define LZO_VERSION_DATE "Oct 18 2000"
/* internal Autoconf configuration file - only used when building LZO */
#if defined(LZO_HAVE_CONFIG_H)
# include <config.h>
#endif
#include <limits.h>
-#include <stddef.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
/***********************************************************************
@@ -48,38 +54,78 @@
#if !defined(CHAR_BIT) || (CHAR_BIT != 8)
# error "invalid CHAR_BIT"
#endif
-#if !defined(UCHAR_MAX) || !defined(USHRT_MAX) || !defined(UINT_MAX) || !defined(ULONG_MAX)
+#if !defined(UCHAR_MAX) || !defined(UINT_MAX) || !defined(ULONG_MAX)
# error "check your compiler installation"
#endif
#if (USHRT_MAX < 1) || (UINT_MAX < 1) || (ULONG_MAX < 1)
# error "your limits.h macros are broken"
#endif
-/* get OS and architecture defines */
-#ifndef __LZODEFS_H_INCLUDED
-#include <lzo/lzodefs.h>
-#endif
+/* workaround a cpp bug under hpux 10.20 */
+#define LZO_0xffffffffL 4294967295ul
-#ifdef __cplusplus
-extern "C" {
+/***********************************************************************
+// architecture defines
+************************************************************************/
+
+#if !defined(__LZO_WIN) && !defined(__LZO_DOS) && !defined(__LZO_OS2)
+# if defined(__WINDOWS__) || defined(_WINDOWS) || defined(_Windows)
+# define __LZO_WIN
+# elif defined(__WIN32__) || defined(_WIN32) || defined(WIN32)
+# define __LZO_WIN
+# elif defined(__NT__) || defined(__NT_DLL__) || defined(__WINDOWS_386__)
+# define __LZO_WIN
+# elif defined(__DOS__) || defined(__MSDOS__) || defined(MSDOS)
+# define __LZO_DOS
+# elif defined(__OS2__) || defined(__OS2V2__) || defined(OS2)
+# define __LZO_OS2
+# elif defined(__palmos__)
+# define __LZO_PALMOS
+# elif defined(__TOS__) || defined(__atarist__)
+# define __LZO_TOS
+# endif
#endif
+#if (UINT_MAX < LZO_0xffffffffL)
+# if defined(__LZO_WIN)
+# define __LZO_WIN16
+# elif defined(__LZO_DOS)
+# define __LZO_DOS16
+# elif defined(__LZO_PALMOS)
+# define __LZO_PALMOS16
+# elif defined(__LZO_TOS)
+# define __LZO_TOS16
+# elif defined(__C166__)
+# else
+# error "16-bit target not supported - contact me for porting hints"
+# endif
+#endif
-/***********************************************************************
-// some core defines
-************************************************************************/
+#if !defined(__LZO_i386)
+# if defined(__LZO_DOS) || defined(__LZO_WIN16)
+# define __LZO_i386
+# elif defined(__i386__) || defined(__386__) || defined(_M_IX86)
+# define __LZO_i386
+# endif
+#endif
+
+#if defined(__LZO_STRICT_16BIT)
+# if (UINT_MAX < LZO_0xffffffffL)
+# include <lzo16bit.h>
+# endif
+#endif
/* memory checkers */
#if !defined(__LZO_CHECKER)
# if defined(__BOUNDS_CHECKING_ON)
-# define __LZO_CHECKER 1
+# define __LZO_CHECKER
# elif defined(__CHECKER__)
-# define __LZO_CHECKER 1
+# define __LZO_CHECKER
# elif defined(__INSURE__)
-# define __LZO_CHECKER 1
+# define __LZO_CHECKER
# elif defined(__PURIFY__)
-# define __LZO_CHECKER 1
+# define __LZO_CHECKER
# endif
#endif
@@ -88,35 +134,36 @@ extern "C" {
// integral and pointer types
************************************************************************/
-/* lzo_uint must match size_t */
+/* Integral types with 32 bits or more */
+#if !defined(LZO_UINT32_MAX)
+# if (UINT_MAX >= LZO_0xffffffffL)
+ typedef unsigned int lzo_uint32;
+ typedef int lzo_int32;
+# define LZO_UINT32_MAX UINT_MAX
+# define LZO_INT32_MAX INT_MAX
+# define LZO_INT32_MIN INT_MIN
+# elif (ULONG_MAX >= LZO_0xffffffffL)
+ typedef unsigned long lzo_uint32;
+ typedef long lzo_int32;
+# define LZO_UINT32_MAX ULONG_MAX
+# define LZO_INT32_MAX LONG_MAX
+# define LZO_INT32_MIN LONG_MIN
+# else
+# error "lzo_uint32"
+# endif
+#endif
+
+/* lzo_uint is used like size_t */
#if !defined(LZO_UINT_MAX)
-# if (LZO_ABI_LLP64)
-# if (LZO_OS_WIN64)
- typedef unsigned __int64 lzo_uint;
- typedef __int64 lzo_int;
-# define LZO_TYPEOF_LZO_INT LZO_TYPEOF___INT64
-# else
- typedef lzo_ullong_t lzo_uint;
- typedef lzo_llong_t lzo_int;
-# define LZO_TYPEOF_LZO_INT LZO_TYPEOF_LONG_LONG
-# endif
-# define LZO_SIZEOF_LZO_INT 8
-# define LZO_UINT_MAX 0xffffffffffffffffull
-# define LZO_INT_MAX 9223372036854775807LL
-# define LZO_INT_MIN (-1LL - LZO_INT_MAX)
-# elif (LZO_ABI_IP32L64) /* MIPS R5900 */
+# if (UINT_MAX >= LZO_0xffffffffL)
typedef unsigned int lzo_uint;
typedef int lzo_int;
-# define LZO_SIZEOF_LZO_INT LZO_SIZEOF_INT
-# define LZO_TYPEOF_LZO_INT LZO_TYPEOF_INT
# define LZO_UINT_MAX UINT_MAX
# define LZO_INT_MAX INT_MAX
# define LZO_INT_MIN INT_MIN
# elif (ULONG_MAX >= LZO_0xffffffffL)
typedef unsigned long lzo_uint;
typedef long lzo_int;
-# define LZO_SIZEOF_LZO_INT LZO_SIZEOF_LONG
-# define LZO_TYPEOF_LZO_INT LZO_TYPEOF_LONG
# define LZO_UINT_MAX ULONG_MAX
# define LZO_INT_MAX LONG_MAX
# define LZO_INT_MIN LONG_MIN
@@ -125,84 +172,47 @@ extern "C" {
# endif
#endif
-/* The larger type of lzo_uint and lzo_uint32_t. */
-#if (LZO_SIZEOF_LZO_INT >= 4)
-# define lzo_xint lzo_uint
-#else
-# define lzo_xint lzo_uint32_t
-#endif
-
-typedef int lzo_bool;
-/* sanity checks */
-LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int) == LZO_SIZEOF_LZO_INT)
-LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_uint) == LZO_SIZEOF_LZO_INT)
-LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_xint) >= sizeof(lzo_uint))
-LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_xint) >= sizeof(lzo_uint32_t))
-
-#ifndef __LZO_MMODEL
-#define __LZO_MMODEL /*empty*/
+/* Memory model that allows to access memory at offsets of lzo_uint. */
+#if !defined(__LZO_MMODEL)
+# if (LZO_UINT_MAX <= UINT_MAX)
+# define __LZO_MMODEL
+# elif defined(__LZO_DOS16) || defined(__LZO_WIN16)
+# define __LZO_MMODEL __huge
+# define LZO_999_UNSUPPORTED
+# elif defined(__LZO_PALMOS16) || defined(__LZO_TOS16)
+# define __LZO_MMODEL
+# else
+# error "__LZO_MMODEL"
+# endif
#endif
/* no typedef here because of const-pointer issues */
+#define lzo_byte unsigned char __LZO_MMODEL
#define lzo_bytep unsigned char __LZO_MMODEL *
#define lzo_charp char __LZO_MMODEL *
#define lzo_voidp void __LZO_MMODEL *
#define lzo_shortp short __LZO_MMODEL *
#define lzo_ushortp unsigned short __LZO_MMODEL *
-#define lzo_intp lzo_int __LZO_MMODEL *
+#define lzo_uint32p lzo_uint32 __LZO_MMODEL *
+#define lzo_int32p lzo_int32 __LZO_MMODEL *
#define lzo_uintp lzo_uint __LZO_MMODEL *
-#define lzo_xintp lzo_xint __LZO_MMODEL *
+#define lzo_intp lzo_int __LZO_MMODEL *
#define lzo_voidpp lzo_voidp __LZO_MMODEL *
#define lzo_bytepp lzo_bytep __LZO_MMODEL *
-#define lzo_int8_tp lzo_int8_t __LZO_MMODEL *
-#define lzo_uint8_tp lzo_uint8_t __LZO_MMODEL *
-#define lzo_int16_tp lzo_int16_t __LZO_MMODEL *
-#define lzo_uint16_tp lzo_uint16_t __LZO_MMODEL *
-#define lzo_int32_tp lzo_int32_t __LZO_MMODEL *
-#define lzo_uint32_tp lzo_uint32_t __LZO_MMODEL *
-#if defined(lzo_int64_t)
-#define lzo_int64_tp lzo_int64_t __LZO_MMODEL *
-#define lzo_uint64_tp lzo_uint64_t __LZO_MMODEL *
-#endif
+typedef int lzo_bool;
-/* Older LZO versions used to support ancient systems and memory models
- * such as 16-bit MSDOS with __huge pointers or Cray PVP, but these
- * obsolete configurations are not supported any longer.
- */
-#if defined(__LZO_MMODEL_HUGE)
-#error "__LZO_MMODEL_HUGE memory model is unsupported"
-#endif
-#if (LZO_MM_PVP)
-#error "LZO_MM_PVP memory model is unsupported"
-#endif
-#if (LZO_SIZEOF_INT < 4)
-#error "LZO_SIZEOF_INT < 4 is unsupported"
-#endif
-#if (__LZO_UINTPTR_T_IS_POINTER)
-#error "__LZO_UINTPTR_T_IS_POINTER is unsupported"
+#ifndef lzo_sizeof_dict_t
+# define lzo_sizeof_dict_t sizeof(lzo_bytep)
#endif
-LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(int) >= 4)
-LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_uint) >= 4)
-/* Strange configurations where sizeof(lzo_uint) != sizeof(size_t) should
- * work but have not received much testing lately, so be strict here.
- */
-LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_uint) == sizeof(size_t))
-LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_uint) == sizeof(ptrdiff_t))
-LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_uint) == sizeof(lzo_uintptr_t))
-LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(void *) == sizeof(lzo_uintptr_t))
-LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(char *) == sizeof(lzo_uintptr_t))
-LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(long *) == sizeof(lzo_uintptr_t))
-LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(void *) == sizeof(lzo_voidp))
-LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(char *) == sizeof(lzo_bytep))
/***********************************************************************
// function types
************************************************************************/
-/* name mangling */
+/* linkage */
#if !defined(__LZO_EXTERN_C)
# ifdef __cplusplus
# define __LZO_EXTERN_C extern "C"
@@ -211,92 +221,81 @@ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(char *) == sizeof(lzo_bytep))
# endif
#endif
-/* calling convention */
+/* calling conventions */
#if !defined(__LZO_CDECL)
-# define __LZO_CDECL __lzo_cdecl
+# if defined(__LZO_DOS16) || defined(__LZO_WIN16)
+# define __LZO_CDECL __far __cdecl
+# elif defined(__LZO_i386) && defined(_MSC_VER)
+# define __LZO_CDECL __cdecl
+# elif defined(__LZO_i386) && defined(__WATCOMC__)
+# define __LZO_CDECL __near __cdecl
+# else
+# define __LZO_CDECL
+# endif
+#endif
+#if !defined(__LZO_ENTRY)
+# define __LZO_ENTRY __LZO_CDECL
#endif
/* DLL export information */
#if !defined(__LZO_EXPORT1)
-# define __LZO_EXPORT1 /*empty*/
+# define __LZO_EXPORT1
#endif
#if !defined(__LZO_EXPORT2)
-# define __LZO_EXPORT2 /*empty*/
+# define __LZO_EXPORT2
#endif
-/* __cdecl calling convention for public C and assembly functions */
+/* calling convention for C functions */
#if !defined(LZO_PUBLIC)
-# define LZO_PUBLIC(r) __LZO_EXPORT1 r __LZO_EXPORT2 __LZO_CDECL
+# define LZO_PUBLIC(_rettype) __LZO_EXPORT1 _rettype __LZO_EXPORT2 __LZO_ENTRY
#endif
#if !defined(LZO_EXTERN)
-# define LZO_EXTERN(r) __LZO_EXTERN_C LZO_PUBLIC(r)
+# define LZO_EXTERN(_rettype) __LZO_EXTERN_C LZO_PUBLIC(_rettype)
#endif
#if !defined(LZO_PRIVATE)
-# define LZO_PRIVATE(r) static r __LZO_CDECL
+# define LZO_PRIVATE(_rettype) static _rettype __LZO_ENTRY
+#endif
+
+/* cdecl calling convention for assembler functions */
+#if !defined(LZO_PUBLIC_CDECL)
+# define LZO_PUBLIC_CDECL(_rettype) \
+ __LZO_EXPORT1 _rettype __LZO_EXPORT2 __LZO_CDECL
+#endif
+#if !defined(LZO_EXTERN_CDECL)
+# define LZO_EXTERN_CDECL(_rettype) __LZO_EXTERN_C LZO_PUBLIC_CDECL(_rettype)
#endif
-/* function types */
+
typedef int
-(__LZO_CDECL *lzo_compress_t) ( const lzo_bytep src, lzo_uint src_len,
- lzo_bytep dst, lzo_uintp dst_len,
+(__LZO_ENTRY *lzo_compress_t) ( const lzo_byte *src, lzo_uint src_len,
+ lzo_byte *dst, lzo_uint *dst_len,
lzo_voidp wrkmem );
typedef int
-(__LZO_CDECL *lzo_decompress_t) ( const lzo_bytep src, lzo_uint src_len,
- lzo_bytep dst, lzo_uintp dst_len,
+(__LZO_ENTRY *lzo_decompress_t) ( const lzo_byte *src, lzo_uint src_len,
+ lzo_byte *dst, lzo_uint *dst_len,
lzo_voidp wrkmem );
typedef int
-(__LZO_CDECL *lzo_optimize_t) ( lzo_bytep src, lzo_uint src_len,
- lzo_bytep dst, lzo_uintp dst_len,
+(__LZO_ENTRY *lzo_optimize_t) ( lzo_byte *src, lzo_uint src_len,
+ lzo_byte *dst, lzo_uint *dst_len,
lzo_voidp wrkmem );
typedef int
-(__LZO_CDECL *lzo_compress_dict_t)(const lzo_bytep src, lzo_uint src_len,
- lzo_bytep dst, lzo_uintp dst_len,
- lzo_voidp wrkmem,
- const lzo_bytep dict, lzo_uint dict_len );
+(__LZO_ENTRY *lzo_compress_dict_t)(const lzo_byte *src, lzo_uint src_len,
+ lzo_byte *dst, lzo_uint *dst_len,
+ lzo_voidp wrkmem,
+ const lzo_byte *dict, lzo_uint dict_len );
typedef int
-(__LZO_CDECL *lzo_decompress_dict_t)(const lzo_bytep src, lzo_uint src_len,
- lzo_bytep dst, lzo_uintp dst_len,
- lzo_voidp wrkmem,
- const lzo_bytep dict, lzo_uint dict_len );
-
-
-/* Callback interface. Currently only the progress indicator ("nprogress")
- * is used, but this may change in a future release. */
+(__LZO_ENTRY *lzo_decompress_dict_t)(const lzo_byte *src, lzo_uint src_len,
+ lzo_byte *dst, lzo_uint *dst_len,
+ lzo_voidp wrkmem,
+ const lzo_byte *dict, lzo_uint dict_len );
-struct lzo_callback_t;
-typedef struct lzo_callback_t lzo_callback_t;
-#define lzo_callback_p lzo_callback_t __LZO_MMODEL *
-
-/* malloc & free function types */
-typedef lzo_voidp (__LZO_CDECL *lzo_alloc_func_t)
- (lzo_callback_p self, lzo_uint items, lzo_uint size);
-typedef void (__LZO_CDECL *lzo_free_func_t)
- (lzo_callback_p self, lzo_voidp ptr);
/* a progress indicator callback function */
-typedef void (__LZO_CDECL *lzo_progress_func_t)
- (lzo_callback_p, lzo_uint, lzo_uint, int);
-
-struct lzo_callback_t
-{
- /* custom allocators (set to 0 to disable) */
- lzo_alloc_func_t nalloc; /* [not used right now] */
- lzo_free_func_t nfree; /* [not used right now] */
-
- /* a progress indicator callback function (set to 0 to disable) */
- lzo_progress_func_t nprogress;
-
- /* INFO: the first parameter "self" of the nalloc/nfree/nprogress
- * callbacks points back to this struct, so you are free to store
- * some extra info in the following variables. */
- lzo_voidp user1;
- lzo_xint user2;
- lzo_xint user3;
-};
+typedef void (__LZO_ENTRY *lzo_progress_callback_t) (lzo_uint, lzo_uint);
/***********************************************************************
@@ -309,35 +308,26 @@ struct lzo_callback_t
*/
#define LZO_E_OK 0
#define LZO_E_ERROR (-1)
-#define LZO_E_OUT_OF_MEMORY (-2) /* [lzo_alloc_func_t failure] */
-#define LZO_E_NOT_COMPRESSIBLE (-3) /* [not used right now] */
+#define LZO_E_OUT_OF_MEMORY (-2) /* not used right now */
+#define LZO_E_NOT_COMPRESSIBLE (-3) /* not used right now */
#define LZO_E_INPUT_OVERRUN (-4)
#define LZO_E_OUTPUT_OVERRUN (-5)
#define LZO_E_LOOKBEHIND_OVERRUN (-6)
#define LZO_E_EOF_NOT_FOUND (-7)
#define LZO_E_INPUT_NOT_CONSUMED (-8)
-#define LZO_E_NOT_YET_IMPLEMENTED (-9) /* [not used right now] */
-#define LZO_E_INVALID_ARGUMENT (-10)
-#define LZO_E_INVALID_ALIGNMENT (-11) /* pointer argument is not properly aligned */
-#define LZO_E_OUTPUT_NOT_CONSUMED (-12)
-#define LZO_E_INTERNAL_ERROR (-99)
-#ifndef lzo_sizeof_dict_t
-# define lzo_sizeof_dict_t ((unsigned)sizeof(lzo_bytep))
-#endif
-
/* lzo_init() should be the first function you call.
* Check the return code !
*
* lzo_init() is a macro to allow checking that the library and the
* compiler's view of various types are consistent.
*/
-#define lzo_init() __lzo_init_v2(LZO_VERSION,(int)sizeof(short),(int)sizeof(int),\
- (int)sizeof(long),(int)sizeof(lzo_uint32_t),(int)sizeof(lzo_uint),\
+#define lzo_init() __lzo_init2(LZO_VERSION,(int)sizeof(short),(int)sizeof(int),\
+ (int)sizeof(long),(int)sizeof(lzo_uint32),(int)sizeof(lzo_uint),\
(int)lzo_sizeof_dict_t,(int)sizeof(char *),(int)sizeof(lzo_voidp),\
- (int)sizeof(lzo_callback_t))
-LZO_EXTERN(int) __lzo_init_v2(unsigned,int,int,int,int,int,int,int,int,int);
+ (int)sizeof(lzo_compress_t))
+LZO_EXTERN(int) __lzo_init2(unsigned,int,int,int,int,int,int,int,int,int);
/* version functions (useful for shared libraries) */
LZO_EXTERN(unsigned) lzo_version(void);
@@ -348,99 +338,44 @@ LZO_EXTERN(const lzo_charp) _lzo_version_date(void);
/* string functions */
LZO_EXTERN(int)
- lzo_memcmp(const lzo_voidp a, const lzo_voidp b, lzo_uint len);
+lzo_memcmp(const lzo_voidp _s1, const lzo_voidp _s2, lzo_uint _len);
LZO_EXTERN(lzo_voidp)
- lzo_memcpy(lzo_voidp dst, const lzo_voidp src, lzo_uint len);
+lzo_memcpy(lzo_voidp _dest, const lzo_voidp _src, lzo_uint _len);
LZO_EXTERN(lzo_voidp)
- lzo_memmove(lzo_voidp dst, const lzo_voidp src, lzo_uint len);
+lzo_memmove(lzo_voidp _dest, const lzo_voidp _src, lzo_uint _len);
LZO_EXTERN(lzo_voidp)
- lzo_memset(lzo_voidp buf, int c, lzo_uint len);
+lzo_memset(lzo_voidp _s, int _c, lzo_uint _len);
/* checksum functions */
-LZO_EXTERN(lzo_uint32_t)
- lzo_adler32(lzo_uint32_t c, const lzo_bytep buf, lzo_uint len);
-LZO_EXTERN(lzo_uint32_t)
- lzo_crc32(lzo_uint32_t c, const lzo_bytep buf, lzo_uint len);
-LZO_EXTERN(const lzo_uint32_tp)
- lzo_get_crc32_table(void);
-
-/* misc. */
-LZO_EXTERN(int) _lzo_config_check(void);
-typedef union {
- lzo_voidp a00; lzo_bytep a01; lzo_uint a02; lzo_xint a03; lzo_uintptr_t a04;
- void *a05; unsigned char *a06; unsigned long a07; size_t a08; ptrdiff_t a09;
-#if defined(lzo_int64_t)
- lzo_uint64_t a10;
-#endif
-} lzo_align_t;
+LZO_EXTERN(lzo_uint32)
+lzo_adler32(lzo_uint32 _adler, const lzo_byte *_buf, lzo_uint _len);
+LZO_EXTERN(lzo_uint32)
+lzo_crc32(lzo_uint32 _c, const lzo_byte *_buf, lzo_uint _len);
-/* align a char pointer on a boundary that is a multiple of 'size' */
-LZO_EXTERN(unsigned) __lzo_align_gap(const lzo_voidp p, lzo_uint size);
-#define LZO_PTR_ALIGN_UP(p,size) \
- ((p) + (lzo_uint) __lzo_align_gap((const lzo_voidp)(p),(lzo_uint)(size)))
+/* memory allocation functions */
+LZO_EXTERN(lzo_bytep) lzo_alloc(lzo_uint _nelems, lzo_uint _size);
+LZO_EXTERN(lzo_bytep) lzo_malloc(lzo_uint _size);
+LZO_EXTERN(void) lzo_free(lzo_voidp _ptr);
+typedef lzo_bytep (__LZO_ENTRY *lzo_alloc_hook_t) (lzo_uint, lzo_uint);
+typedef void (__LZO_ENTRY *lzo_free_hook_t) (lzo_voidp);
-/***********************************************************************
-// deprecated macros - only for backward compatibility
-************************************************************************/
-
-/* deprecated - use 'lzo_bytep' instead of 'lzo_byte *' */
-#define lzo_byte unsigned char
-/* deprecated type names */
-#define lzo_int32 lzo_int32_t
-#define lzo_uint32 lzo_uint32_t
-#define lzo_int32p lzo_int32_t __LZO_MMODEL *
-#define lzo_uint32p lzo_uint32_t __LZO_MMODEL *
-#define LZO_INT32_MAX LZO_INT32_C(2147483647)
-#define LZO_UINT32_MAX LZO_UINT32_C(4294967295)
-#if defined(lzo_int64_t)
-#define lzo_int64 lzo_int64_t
-#define lzo_uint64 lzo_uint64_t
-#define lzo_int64p lzo_int64_t __LZO_MMODEL *
-#define lzo_uint64p lzo_uint64_t __LZO_MMODEL *
-#define LZO_INT64_MAX LZO_INT64_C(9223372036854775807)
-#define LZO_UINT64_MAX LZO_UINT64_C(18446744073709551615)
-#endif
-/* deprecated types */
-typedef union { lzo_bytep a; lzo_uint b; } __lzo_pu_u;
-typedef union { lzo_bytep a; lzo_uint32_t b; } __lzo_pu32_u;
-/* deprecated defines */
-#if !defined(LZO_SIZEOF_LZO_UINT)
-# define LZO_SIZEOF_LZO_UINT LZO_SIZEOF_LZO_INT
-#endif
+extern lzo_alloc_hook_t lzo_alloc_hook;
+extern lzo_free_hook_t lzo_free_hook;
-#if defined(LZO_CFG_COMPAT)
-
-#define __LZOCONF_H 1
-
-#if defined(LZO_ARCH_I086)
-# define __LZO_i386 1
-#elif defined(LZO_ARCH_I386)
-# define __LZO_i386 1
-#endif
-
-#if defined(LZO_OS_DOS16)
-# define __LZO_DOS 1
-# define __LZO_DOS16 1
-#elif defined(LZO_OS_DOS32)
-# define __LZO_DOS 1
-#elif defined(LZO_OS_WIN16)
-# define __LZO_WIN 1
-# define __LZO_WIN16 1
-#elif defined(LZO_OS_WIN32)
-# define __LZO_WIN 1
-#endif
-
-#define __LZO_CMODEL /*empty*/
-#define __LZO_DMODEL /*empty*/
-#define __LZO_ENTRY __LZO_CDECL
-#define LZO_EXTERN_CDECL LZO_EXTERN
-#define LZO_ALIGN LZO_PTR_ALIGN_UP
+/* misc. */
+LZO_EXTERN(lzo_bool) lzo_assert(int _expr);
+LZO_EXTERN(int) _lzo_config_check(void);
+typedef union { lzo_bytep p; lzo_uint u; } __lzo_pu_u;
+typedef union { lzo_bytep p; lzo_uint32 u32; } __lzo_pu32_u;
-#define lzo_compress_asm_t lzo_compress_t
-#define lzo_decompress_asm_t lzo_decompress_t
+/* align a char pointer on a boundary that is a multiple of `size' */
+LZO_EXTERN(unsigned) __lzo_align_gap(const lzo_voidp _ptr, lzo_uint _size);
+#define LZO_PTR_ALIGN_UP(_ptr,_size) \
+ ((_ptr) + (lzo_uint) __lzo_align_gap((const lzo_voidp)(_ptr),(lzo_uint)(_size)))
-#endif /* LZO_CFG_COMPAT */
+/* deprecated - only for backward compatibility */
+#define LZO_ALIGN(_ptr,_size) LZO_PTR_ALIGN_UP(_ptr,_size)
#ifdef __cplusplus
@@ -449,5 +384,3 @@ typedef union { lzo_bytep a; lzo_uint32_t b; } __lzo_pu32_u;
#endif /* already included */
-
-/* vim:set ts=4 sw=4 et: */
diff --git a/mkflfs/lzodefs.h b/mkflfs/lzodefs.h
deleted file mode 100644
index 1535c1e..0000000
--- a/mkflfs/lzodefs.h
+++ /dev/null
@@ -1,3134 +0,0 @@
-/* lzodefs.h -- architecture, OS and compiler specific defines
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
- Markus F.X.J. Oberhumer
- <ma...@ob...>
- http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#ifndef __LZODEFS_H_INCLUDED
-#define __LZODEFS_H_INCLUDED 1
-
-#if defined(__CYGWIN32__) && !defined(__CYGWIN__)
-# define __CYGWIN__ __CYGWIN32__
-#endif
-#if 1 && defined(__INTERIX) && defined(__GNUC__) && ...
[truncated message content] |
Thanks for helping keep SourceForge clean.
X