Merge remote-tracking branch 'oe_21/master' into vuplus-3.0-next
[vuplus_openvuplus_3.0] / meta-openvuplus / recipes-support / lzma / lzma-4.65 / 003-compile_fixes.patch
1 diff -urN lzma-4.65/CPP/7zip/Common/FileStreams.h lzma-4.65.new/CPP/7zip/Common/FileStreams.h
2 --- lzma-4.65/CPP/7zip/Common/FileStreams.h     2009-05-15 23:33:51.000000000 +0200
3 +++ lzma-4.65.new/CPP/7zip/Common/FileStreams.h 2009-06-01 22:30:01.000000000 +0200
4 @@ -72,6 +72,7 @@
5    public IOutStream,
6    public CMyUnknownImp
7  {
8 +public:
9    #ifdef USE_WIN_FILE
10    NWindows::NFile::NIO::COutFile File;
11    #else
12 diff -urN lzma-4.65/CPP/Common/MyWindows.h lzma-4.65.new/CPP/Common/MyWindows.h
13 --- lzma-4.65/CPP/Common/MyWindows.h    2009-05-15 23:33:51.000000000 +0200
14 +++ lzma-4.65.new/CPP/Common/MyWindows.h        2009-06-01 22:29:26.000000000 +0200
15 @@ -101,8 +101,11 @@
16  
17  #ifdef __cplusplus
18  
19 +#ifndef INITGUID
20 +#define INITGUID
21  DEFINE_GUID(IID_IUnknown,
22  0x00000000, 0x0000, 0x0000, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46);
23 +#endif
24  struct IUnknown
25  {
26    STDMETHOD(QueryInterface) (REFIID iid, void **outObject) PURE;