aboutsummaryrefslogtreecommitdiffstats
path: root/tools/lzma/patches/003-compile_fixes.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2009-06-01 20:31:49 +0000
committerFlorian Fainelli <florian@openwrt.org>2009-06-01 20:31:49 +0000
commit6c5ba45f54e27030a6fc3a40d0b78518dc6dc143 (patch)
treef513ec5e937fcbe15f40e95a6c116d9dcfa1e128 /tools/lzma/patches/003-compile_fixes.patch
parent548de949f392049420a6a1feeef118b30ab8ea8c (diff)
downloadupstream-6c5ba45f54e27030a6fc3a40d0b78518dc6dc143.tar.gz
upstream-6c5ba45f54e27030a6fc3a40d0b78518dc6dc143.tar.bz2
upstream-6c5ba45f54e27030a6fc3a40d0b78518dc6dc143.zip
port lzmp that is packaged by debian, build it, but do not install it yet
SVN-Revision: 16282
Diffstat (limited to 'tools/lzma/patches/003-compile_fixes.patch')
-rw-r--r--tools/lzma/patches/003-compile_fixes.patch26
1 files changed, 26 insertions, 0 deletions
diff --git a/tools/lzma/patches/003-compile_fixes.patch b/tools/lzma/patches/003-compile_fixes.patch
new file mode 100644
index 0000000000..49ae66b9c4
--- /dev/null
+++ b/tools/lzma/patches/003-compile_fixes.patch
@@ -0,0 +1,26 @@
+diff -urN lzma-4.65/CPP/7zip/Common/FileStreams.h lzma-4.65.new/CPP/7zip/Common/FileStreams.h
+--- lzma-4.65/CPP/7zip/Common/FileStreams.h 2009-05-15 23:33:51.000000000 +0200
++++ lzma-4.65.new/CPP/7zip/Common/FileStreams.h 2009-06-01 22:30:01.000000000 +0200
+@@ -72,6 +72,7 @@
+ public IOutStream,
+ public CMyUnknownImp
+ {
++public:
+ #ifdef USE_WIN_FILE
+ NWindows::NFile::NIO::COutFile File;
+ #else
+diff -urN lzma-4.65/CPP/Common/MyWindows.h lzma-4.65.new/CPP/Common/MyWindows.h
+--- lzma-4.65/CPP/Common/MyWindows.h 2009-05-15 23:33:51.000000000 +0200
++++ lzma-4.65.new/CPP/Common/MyWindows.h 2009-06-01 22:29:26.000000000 +0200
+@@ -101,8 +101,11 @@
+
+ #ifdef __cplusplus
+
++#ifndef INITGUID
++#define INITGUID
+ DEFINE_GUID(IID_IUnknown,
+ 0x00000000, 0x0000, 0x0000, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46);
++#endif
+ struct IUnknown
+ {
+ STDMETHOD(QueryInterface) (REFIID iid, void **outObject) PURE;