From 9b82f7b2e7006ec251a04964cc71f81ff9de7eb4 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Sat, 10 Oct 2015 08:09:12 +0200 Subject: [PATCH] Revert "lzma pedantic fixes (nw)" No updating of 3rdparty allowed This reverts commit 94aa0602d548cf2b39c59458adb9e262ec8db8b6. --- 3rdparty/lzma/C/CpuArch.c | 6 +++--- 3rdparty/lzma/C/LzmaDec.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/3rdparty/lzma/C/CpuArch.c b/3rdparty/lzma/C/CpuArch.c index ea96bc69762..caf21643cef 100644 --- a/3rdparty/lzma/C/CpuArch.c +++ b/3rdparty/lzma/C/CpuArch.c @@ -82,7 +82,7 @@ static void MyCPUID(UInt32 function, UInt32 *a, UInt32 *b, UInt32 *c, UInt32 *d) "=c" (*c) , "=d" (*d) : "0" (function)) ; - #else /* __PIC__ */ + #else // __PIC__ __asm__ __volatile__ ( "cpuid" : "=a" (*a) , @@ -90,8 +90,8 @@ static void MyCPUID(UInt32 function, UInt32 *a, UInt32 *b, UInt32 *c, UInt32 *d) "=c" (*c) , "=d" (*d) : "0" (function)) ; - #endif /* __PIC__ */ - + #endif // __PIC__ + #endif #else diff --git a/3rdparty/lzma/C/LzmaDec.c b/3rdparty/lzma/C/LzmaDec.c index 091ce376336..f7f79bb063d 100644 --- a/3rdparty/lzma/C/LzmaDec.c +++ b/3rdparty/lzma/C/LzmaDec.c @@ -967,7 +967,7 @@ SRes LzmaDec_Allocate(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAll return SZ_OK; } -/* why isn't there an interface to pass in the properties directly???? */ +// why isn't there an interface to pass in the properties directly???? SRes LzmaDec_Allocate_MAME(CLzmaDec *p, const CLzmaProps *propNew, ISzAlloc *alloc) { SizeT dicBufSize;