X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=include%2Flzma%2FLzmaTypes.h;h=31ef31c83caff47679ce214c1ded3dc4d30bf89a;hb=8a36287a019f5d7532a8a1a7da6aa96e490dbb8a;hp=02daa59174d09df8cef52717c2f836c6e5b91f32;hpb=fc9c1727b5b3483ce49c3cb668e8332fb001b8a7;p=oweals%2Fu-boot.git diff --git a/include/lzma/LzmaTypes.h b/include/lzma/LzmaTypes.h index 02daa59174..31ef31c83c 100644 --- a/include/lzma/LzmaTypes.h +++ b/include/lzma/LzmaTypes.h @@ -1,31 +1,20 @@ /* - * 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 - * 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 + * SPDX-License-Identifier: GPL-2.0+ */ -#ifndef __LZMATYPES_H__FAKE__ -#define __LZMATYPES_H__FAKE__ +#ifndef __TYPES_H__FAKE__ +#define __TYPES_H__FAKE__ + +/* + *This avoids the collition with zlib.h Byte definition + */ +#define Byte LZByte -#include "../../lib_generic/lzma/LzmaTypes.h" +#include "../../lib/lzma/Types.h" #endif