@@ -1,3 +1,7 @@

+Wed Jul 11 10:20:53 BST 2007 (njh)

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

+  * libclamav:	Fix warnings on HP-UX

+

 Wed Jul 11 10:12:36 BST 2007 (trog)

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

   * libclamav: add ARJ and SFX-ARJ support

@@ -103,7 +103,7 @@ static	char	const	rcsid[] = "$Id: binhex.c,v 1.23 2007/02/12 20:46:08 njh Exp $"

 #endif

 #endif

-#if HAVE_MMAP

+#ifdef	HAVE_MMAP

 #if HAVE_SYS_MMAN_H

 #include <sys/mman.h>

 #else /* HAVE_SYS_MMAN_H */

@@ -4494,7 +4494,7 @@ nonblock_connect(int sock, const struct sockaddr *addr, socklen_t addrlen, int s

 	for (;;) {

 		fd_set fds;

 		struct timeval now;

-		struct timeval wait;

+		struct timeval waittime;

 		int n;

 		/* Force timeout if we ran out of time */

@@ -4505,14 +4505,14 @@ nonblock_connect(int sock, const struct sockaddr *addr, socklen_t addrlen, int s

 			break; /* failed */

 		}

-		/* Calculate into 'wait' how long to wait */

-		timersub(&timeout, &now, &wait); /* wait = timeout - now */

+		/* Calculate into 'waittime' how long to wait */

+		timersub(&timeout, &now, &waittime); /* wait = timeout - now */

 		/* Init fds with 'sock' as the only fd */

 		FD_ZERO(&fds);

 		FD_SET(sock, &fds);

-		n = select(numfd, 0, &fds, 0, &wait);

+		n = select(numfd, 0, &fds, 0, &waittime);

 		if (n < 0) {

 			cli_warnmsg("nonblock_connect: select() failure %d: errno=%d: %s\n",

 				select_failures, errno, strerror(errno));

@@ -24,7 +24,7 @@ static	char	const	rcsid[] = "$Id: pdf.c,v 1.61 2007/02/12 20:46:09 njh Exp $";

 #include "clamav-config.h"

 #endif

-#if HAVE_MMAP

+#ifdef	HAVE_MMAP

 #include <stdio.h>

 #include <sys/types.h>

 #include <sys/stat.h>