[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b

[aCaB]

The following commit has been merged in the debian/unstable branch:
commit 25c241ef610bf30e497d2c0cd104bd6557f7d985
Author: aCaB <acab at clamav.net>
Date:   Tue Aug 11 02:07:28 2009 +0200

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

diff --git a/ChangeLog b/ChangeLog
index a855751..0c9556c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/libclamav/7z/Types.h b/libclamav/7z/Types.h
index 2638196..ad69354 100644
--- a/libclamav/7z/Types.h
+++ b/libclamav/7z/Types.h
@@ -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;
 

-- 
Debian repository for ClamAV