X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Flzma%2FLzmaTypes.h;h=740720cfe9bb27c3bc965d41c94a01e8a408adde;hb=1120ad600be10d4332457d871c98b1fcc61b4a0b;hp=02daa59174d09df8cef52717c2f836c6e5b91f32;hpb=fc9c1727b5b3483ce49c3cb668e8332fb001b8a7;p=u-boot

diff --git a/include/lzma/LzmaTypes.h b/include/lzma/LzmaTypes.h
index 02daa59174..740720cfe9 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/lzma/Types.h"
 
 #endif