From caf72ff329759b4da71352ab098537c7698c0e9f Mon Sep 17 00:00:00 2001 From: Luigi 'Comio' Mantellini Date: Tue, 21 Jul 2009 10:45:49 +0200 Subject: Refresh LZMA-lib to v4.65 Signed-off-by: Luigi 'Comio' Mantellini --- include/lzma/LzmaDec.h | 31 +++++++++++++++++++++++++++++++ include/lzma/LzmaDecode.h | 31 ------------------------------- include/lzma/LzmaTools.h | 2 +- include/lzma/LzmaTypes.h | 15 ++++++++++----- 4 files changed, 42 insertions(+), 37 deletions(-) create mode 100644 include/lzma/LzmaDec.h delete mode 100644 include/lzma/LzmaDecode.h (limited to 'include/lzma') diff --git a/include/lzma/LzmaDec.h b/include/lzma/LzmaDec.h new file mode 100644 index 0000000000..967cdd1018 --- /dev/null +++ b/include/lzma/LzmaDec.h @@ -0,0 +1,31 @@ +/* + * Fake include for LzmaDec.h + * + * Copyright (C) 2007-2009 Industrie Dial Face S.p.A. + * Luigi 'Comio' Mantellini (luigi.mantellini@idf-hit.com) + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program 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. + * + * This program 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 this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#ifndef __LZMADEC_H__FAKE__ +#define __LZMADEC_H__FAKE__ + +#include "../../lib_generic/lzma/LzmaDec.h" + +#endif diff --git a/include/lzma/LzmaDecode.h b/include/lzma/LzmaDecode.h deleted file mode 100644 index 8fdb2c0862..0000000000 --- a/include/lzma/LzmaDecode.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Fake include for LzmaDecode.h - * - * Copyright (C) 2007-2008 Industrie Dial Face S.p.A. - * Luigi 'Comio' Mantellini (luigi.mantellini@idf-hit.com) - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program 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. - * - * This program 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 this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - */ - -#ifndef __LZMADECODE_H__FAKE__ -#define __LZMADECODE_H__FAKE__ - -#include "../../lib_generic/lzma/LzmaDecode.h" - -#endif diff --git a/include/lzma/LzmaTools.h b/include/lzma/LzmaTools.h index 7c5eea113c..87943c0332 100644 --- a/include/lzma/LzmaTools.h +++ b/include/lzma/LzmaTools.h @@ -1,7 +1,7 @@ /* * Fake include for LzmaTools.h * - * Copyright (C) 2007-2008 Industrie Dial Face S.p.A. + * Copyright (C) 2007-2009 Industrie Dial Face S.p.A. * Luigi 'Comio' Mantellini (luigi.mantellini@idf-hit.com) * * See file CREDITS for list of people who contributed to this diff --git a/include/lzma/LzmaTypes.h b/include/lzma/LzmaTypes.h index 02daa59174..86160a42b2 100644 --- a/include/lzma/LzmaTypes.h +++ b/include/lzma/LzmaTypes.h @@ -1,7 +1,7 @@ /* - * Fake include for LzmaTypes.h + * Fake include for Types.h * - * Copyright (C) 2007-2008 Industrie Dial Face S.p.A. + * Copyright (C) 2007-2009 Industrie Dial Face S.p.A. * Luigi 'Comio' Mantellini (luigi.mantellini@idf-hit.com) * * See file CREDITS for list of people who contributed to this @@ -23,9 +23,14 @@ * MA 02111-1307 USA */ -#ifndef __LZMATYPES_H__FAKE__ -#define __LZMATYPES_H__FAKE__ +#ifndef __TYPES_H__FAKE__ +#define __TYPES_H__FAKE__ -#include "../../lib_generic/lzma/LzmaTypes.h" +/* + *This avoids the collition with zlib.h Byte definition + */ +#define Byte LZByte + +#include "../../lib_generic/lzma/Types.h" #endif -- cgit v1.2.1