workaround "Byte" clash in lzma/7z (bb#805 - regression)

0.96
aCaB 16 years ago
parent 2dc233533d
commit 25c241ef61
  1. 4
      ChangeLog
  2. 5
      libclamav/7z/Types.h

@ -1,3 +1,7 @@
Tue Aug 11 02:04:54 CEST 2009 (acab)
------------------------------------
* libclamav/7z/Types.h: workaround "Byte" clash in lzma/7z (bb#805 - regression)
Mon Aug 10 22:36:19 CEST 2009 (acab)
------------------------------------
* libclamav/7z*: cosmetic fixes

@ -10,6 +10,9 @@
#include <windows.h>
#endif
/* aCaB -- lame workaround for "Byte" refef */
#include <zconf.h>
#define SZ_OK 0
#define SZ_ERROR_DATA 1
@ -40,7 +43,9 @@ typedef int WRes;
#define RINOK(x) { int __result__ = (x); if (__result__ != 0) return __result__; }
#endif
/* aCaB -- use Byte defined in zconf.h
typedef unsigned char Byte;
*/
typedef short Int16;
typedef unsigned short UInt16;

Loading…
Cancel
Save