SOURCES: lzma-type-redefinition.patch (NEW) - avoid type redefinition

[wolf]

Author: wolf                         Date: Sat May 27 18:47:27 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- avoid type redefinition

---- Files affected:
SOURCES:
   lzma-type-redefinition.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/lzma-type-redefinition.patch
diff -u /dev/null SOURCES/lzma-type-redefinition.patch:1.1
--- /dev/null	Sat May 27 20:47:27 2006
+++ SOURCES/lzma-type-redefinition.patch	Sat May 27 20:47:22 2006
@@ -0,0 +1,18 @@
+diff -ruN lzma-4.42./C/7zip/Compress/Branch/BranchTypes.h lzma-4.42/C/7zip/Compress/Branch/BranchTypes.h
+--- lzma-4.42./C/7zip/Compress/Branch/BranchTypes.h	2006-04-22 08:34:37.000000000 +0200
++++ lzma-4.42/C/7zip/Compress/Branch/BranchTypes.h	2006-05-27 20:43:03.420392912 +0200
+@@ -3,13 +3,6 @@
+ #ifndef __BRANCHTYPES_H
+ #define __BRANCHTYPES_H
+ 
+-typedef unsigned char Byte;
+-typedef unsigned short UInt16;
+-
+-#ifdef _LZMA_UINT32_IS_ULONG
+-typedef unsigned long UInt32;
+-#else
+-typedef unsigned int UInt32;
+-#endif
++#include "../LZMA_C/LzmaTypes.h"
+ 
+ #endif
================================================================