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

+Sun Feb 25 12:18:42 CET 2007 (tk)

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

+  * libclamav/readdb.c,lockdb.c: merge win32 patches from NJH

+

 Sun Feb 25 01:58:55 CET 2007 (tk)

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

   * clamscan: merge win32 patches from NJH

@@ -64,6 +64,10 @@ pthread_mutex_t lock_mutex = PTHREAD_MUTEX_INITIALIZER;

 #define pthread_mutex_unlock(arg)

 #endif

+#ifdef C_WINDOWS /* FIXME */

+#define DONT_LOCK_DBDIRS

+#endif

+

 struct dblock {

 	struct dblock *lock_link;

 	char lock_file[NAME_MAX];

@@ -17,6 +17,10 @@

  *  MA 02110-1301, USA.

  */

+#ifdef _MSC_VER

+#include <winsock.h> /* for Sleep() */

+#endif

+

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

 #endif

@@ -28,7 +32,7 @@

 #ifdef	HAVE_UNISTD_H

 #include <unistd.h>

 #endif

-#ifndef	C_WINDOWS

+#ifndef C_WINDOWS

 #include <dirent.h>

 #endif

 #include <sys/types.h>

@@ -1319,7 +1323,11 @@ static int cli_loaddbdir(const char *dirname, struct cl_engine **engine, unsigne

     cli_dbgmsg("cli_loaddbdir: Acquiring dbdir lock\n");

     while((lock = cli_readlockdb(dirname, 0)) == CL_ELOCKDB) {

+#ifdef C_WINDOWS

+	Sleep(5);

+#else

 	sleep(5);

+#endif

 	if(try++ > 24) {

 	    cli_errmsg("cl_load(): Unable to lock database directory: %s\n", dirname);

 	    return CL_ELOCKDB;