From 8ff61daa672f051d8ecb537edc94036b6cdaaf3f Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Thu, 22 Jun 2017 16:59:16 +0900 Subject: Imported Upstream version 2.09 Change-Id: Iff3c94491fe695b43f1d6998f93f56af871806a2 Signed-off-by: DongHun Kwak --- minilzo/minilzo.h | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) (limited to 'minilzo/minilzo.h') diff --git a/minilzo/minilzo.h b/minilzo/minilzo.h index 7937454..e5adc6e 100644 --- a/minilzo/minilzo.h +++ b/minilzo/minilzo.h @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2014 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 @@ -32,15 +32,25 @@ */ -#ifndef __MINILZO_H -#define __MINILZO_H 1 +#ifndef __MINILZO_H_INCLUDED +#define __MINILZO_H_INCLUDED 1 -#define MINILZO_VERSION 0x2080 +#define MINILZO_VERSION 0x2090 -#ifdef __LZOCONF_H +#if defined(__LZOCONF_H_INCLUDED) # error "you cannot use both LZO and miniLZO" #endif +/* internal Autoconf configuration file - only used when building miniLZO */ +#ifdef MINILZO_HAVE_CONFIG_H +# include +#endif +#include +#include + +#ifndef __LZODEFS_H_INCLUDED +#include "lzodefs.h" +#endif #undef LZO_HAVE_CONFIG_H #include "lzoconf.h" @@ -92,3 +102,5 @@ lzo1x_decompress_safe ( const lzo_bytep src, lzo_uint src_len, #endif /* already included */ + +/* vim:set ts=4 sw=4 et: */ -- cgit v1.2.3 From 57de6cacd32854c3b7942dde1803894341f78cee Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Thu, 22 Jun 2017 16:59:51 +0900 Subject: Imported Upstream version 2.10 Change-Id: Ic72ac9c6134dff3a335d581378095e0011abcb08 Signed-off-by: DongHun Kwak --- minilzo/minilzo.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'minilzo/minilzo.h') diff --git a/minilzo/minilzo.h b/minilzo/minilzo.h index e5adc6e..c1c2297 100644 --- a/minilzo/minilzo.h +++ b/minilzo/minilzo.h @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or @@ -35,7 +35,7 @@ #ifndef __MINILZO_H_INCLUDED #define __MINILZO_H_INCLUDED 1 -#define MINILZO_VERSION 0x2090 +#define MINILZO_VERSION 0x20a0 /* 2.10 */ #if defined(__LZOCONF_H_INCLUDED) # error "you cannot use both LZO and miniLZO" -- cgit v1.2.3