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

+Tue Feb 13 19:04:35 GMT 2007 (njh)

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

+  * libclamav/mbox.c,phishcheck.c:	Fix compilation errors on BeOS

+

 Tue Feb 13 14:42:15 CET 2007 (tk)

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

   * 0.90 (released with JS and PST code removed)

@@ -16,7 +16,7 @@

  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,

  *  MA 02110-1301, USA.

  */

-static	char	const	rcsid[] = "$Id: mbox.c,v 1.378 2007/02/13 13:04:40 njh Exp $";

+static	char	const	rcsid[] = "$Id: mbox.c,v 1.379 2007/02/13 19:04:07 njh Exp $";

 #ifdef	_MSC_VER

 #include <winsock.h>	/* only needed in CL_EXPERIMENTAL */

@@ -101,7 +101,11 @@ static	void	print_trace(int use_syslog);

 #endif

 #ifdef	HAVE_STDBOOL_H

+#ifdef	C_BEOS

+#include "SupportDefs.h"

+#else

 #include <stdbool.h>

+#endif

 #else

 #ifdef	FALSE

 typedef	unsigned	char	bool;

@@ -167,9 +171,11 @@ typedef	enum {

 #include <netdb.h>

 #include <sys/socket.h>

 #include <netinet/in.h>

+#ifndef	C_BEOS

 #include <net/if.h>

 #include <arpa/inet.h>

 #endif

+#endif

 #ifndef	C_WINDOWS

 #define	closesocket(s)	close(s)

@@ -4338,6 +4344,7 @@ getURL(struct arg *arg)

 	}

 	cli_dbgmsg("Saving %s to %s\n", url, fout);

+#ifndef	C_BEOS

 	if(tcp == 0) {

 		const struct protoent *proto = getprotobyname("tcp");

@@ -4351,6 +4358,7 @@ getURL(struct arg *arg)

 		endprotoent();

 #endif

 	}

+#endif

 	if(default_port == 0) {

 		const struct servent *servent = getservbyname("http", "tcp");

@@ -19,6 +19,9 @@

  *  MA 02110-1301, USA.

  *

  *  $Log: phishcheck.c,v $

+ *  Revision 1.23  2007/02/13 19:04:07  njh

+ *  Fix compilation errors on BeOS

+ *

  *  Revision 1.22  2007/02/12 20:34:31  tkojm

  *  fix hexurl regex (bb#288)

  *

@@ -182,8 +185,6 @@ case CL_PHISH_HOST_NOT_LISTED:

 #include <regex.h>

 #endif

-#include <pthread.h>

-

 #include "others.h"

 #include "defaults.h"

 #include "str.h"