@@ -1,6 +1,10 @@

+Wed Sep 20 14:03:49 BST 2006 (trog)

+-----------------------------------

+  * libclamav/unrar/unrar.c, unrarppm.c: portability changes

+

 Wed Sep 20 11:26:11 BST 2006 (trog)

 -----------------------------------

-  *libclamav/unrar/unrar.c, unrar.h, unrarppm.c, unrarvm.c: Update to align

+  * libclamav/unrar/unrar.c, unrar.h, unrarppm.c, unrarvm.c: Update to align

 			with current RAR version.

 Wed Sep 20 11:22:56 BST 2006 (njh)

@@ -29,7 +29,9 @@

 #include <sys/stat.h>

 #include <fcntl.h>

 #include <stdio.h>

+#ifdef HAVE_UNISTD_H

 #include <unistd.h>

+#endif

 #include <errno.h>

 #include <stdlib.h>

 #include <string.h>

@@ -44,7 +46,7 @@

 #include "others.h"

 #include "cltypes.h"

-#define int64to32(x) ((uint)(x))

+#define int64to32(x) ((unsigned int)(x))

 #define rar_endian_convert_16(v)	le16_to_host(v)

 #define rar_endian_convert_32(v)	le32_to_host(v)

@@ -40,10 +40,11 @@ static void rar_dbgmsg(){};

 #endif

 #define MAX(a,b)    (((a) > (b)) ? (a) : (b))

+#define MAX_O 64

 const unsigned int UNIT_SIZE=MAX(sizeof(struct ppm_context), sizeof(struct rar_mem_blk_tag));

 const unsigned int FIXED_UNIT_SIZE=12;

-const int INT_BITS=7, PERIOD_BITS=7, TOT_BITS=14, MAX_O=64;

+const int INT_BITS=7, PERIOD_BITS=7, TOT_BITS=14;

 const int INTERVAL=1 << 7, BIN_SCALE=1 << 14, MAX_FREQ=124;

 const unsigned int TOP=1 << 24, BOT=1 << 15;