[backfire] tools/lzma-old: merge r28502 (fix compile issues, closes: #10253, #10459)

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@29255 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/tools/lzma-old/patches/100-lzma_zlib.patch b/tools/lzma-old/patches/100-lzma_zlib.patch
index 7436cfe51552c19d8e64b339acd54ff2057fa4cd..32d1263963883233e9089835a5f36139e234e65d 100644 (file)
--- a/tools/lzma-old/patches/100-lzma_zlib.patch
+++ b/tools/lzma-old/patches/100-lzma_zlib.patch
@@ -311,9 +311,9 @@
 +      UInt64 m_offset;
 +};
 +
 +      UInt64 m_offset;
 +};
 +

-+ZEXTERN int ZEXPORT compress2 OF((Bytef *dest,   uLongf *destLen,
++ZEXTERN int ZEXPORT compress2 (Bytef *dest,   uLongf *destLen,

 +                                  const Bytef *source, uLong sourceLen,
 +                                  const Bytef *source, uLong sourceLen,

-+                                  int level))
++                                  int level)

 +{
 +      CInMemoryStream *inStreamSpec = new CInMemoryStream(source, sourceLen);
 +      CMyComPtr<ISequentialInStream> inStream = inStreamSpec;
 +{
 +      CInMemoryStream *inStreamSpec = new CInMemoryStream(source, sourceLen);
 +      CMyComPtr<ISequentialInStream> inStream = inStreamSpec;


@@ -374,8 +374,8 @@
 +      return Z_OK;
 +}
 +
 +      return Z_OK;
 +}
 +

-+ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
-+                                   const Bytef *source, uLong sourceLen))
++ZEXTERN int ZEXPORT uncompress (Bytef *dest,   uLongf *destLen,
++                                   const Bytef *source, uLong sourceLen)

 +{
 +      CInMemoryStream *inStreamSpec = new CInMemoryStream(source, sourceLen);
 +      CMyComPtr<ISequentialInStream> inStream = inStreamSpec;
 +{
 +      CInMemoryStream *inStreamSpec = new CInMemoryStream(source, sourceLen);
 +      CMyComPtr<ISequentialInStream> inStream = inStreamSpec;