@@ -563,3 +563,5 @@

 /* Define to "int" if <sys/socket.h> does not define. */

 #undef socklen_t

+

+#include "platform.h"

@@ -18,10 +18,6 @@

  *  MA 02110-1301, USA.

  */

-#ifdef	_MSC_VER

-#include <winsock.h>

-#endif

-

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

 #endif

@@ -70,10 +66,6 @@

 #include "others.h"

 #include "shared.h"

-#ifndef C_WINDOWS

-#define	closesocket(s)	close(s)

-#endif

-

 short debug_mode = 0, logok = 0;

 short foreground = 0;

@@ -112,12 +104,7 @@ int main(int argc, char **argv)

 	struct stat sb;

 #endif

-#ifdef C_WINDOWS

-    if(!pthread_win32_process_attach_np()) {

-	mprintf("!Can't start the win32 pthreads layer\n");

-        return 1;

-    }

-#else

+#ifndef _WIN32

     memset(&sa, 0, sizeof(sa));

     sa.sa_handler = SIG_IGN;

     sigaction(SIGHUP, &sa, NULL);

@@ -166,7 +153,7 @@ int main(int argc, char **argv)

     umask(0);

     /* drop privileges */

-#if (!defined(C_OS2)) && (!defined(C_WINDOWS))

+#if (!defined(C_OS2)) && (!defined(_WIN32))

     if(geteuid() == 0 && (opt = optget(opts, "User"))->enabled) {

 	if((user = getpwnam(opt->strarg)) == NULL) {

 	    fprintf(stderr, "ERROR: Can't get information about user %s.\n", opt->strarg);

@@ -286,7 +273,7 @@ int main(int argc, char **argv)

     logg("#clamd daemon %s (OS: "TARGET_OS_TYPE", ARCH: "TARGET_ARCH_TYPE", CPU: "TARGET_CPU_TYPE")\n", get_version());

-#ifndef C_WINDOWS

+#ifndef _WIN32

     if(user)

 	logg("#Running as user %s (UID %u, GID %u)\n", user->pw_name, user->pw_uid, user->pw_gid);

 #endif

@@ -429,22 +416,13 @@ int main(int argc, char **argv)

     }

     if(tcpsock) {

-#ifdef C_WINDOWS

-	    WSADATA wsaData;

-

-	if(WSAStartup(MAKEWORD(2,2), &wsaData) != NO_ERROR) {

-	    logg("!Error at WSAStartup(): %d\n", WSAGetLastError());

-	    ret = 1;

-	    break;

-	}

-#endif

 	if ((lsockets[nlsockets] = tcpserver(opts)) == -1) {

 	    ret = 1;

 	    break;

 	}

 	nlsockets++;

     }

-

+#ifndef _WIN32

     if(localsock) {

 	if ((lsockets[nlsockets] = localserver(opts)) == -1) {

 	    ret = 1;

@@ -477,6 +455,7 @@ int main(int argc, char **argv)

     } else

         foreground = 1;

+#endif

     ret = recvloop_th(lsockets, nlsockets, engine, dboptions, opts);

@@ -488,7 +467,7 @@ int main(int argc, char **argv)

 	closesocket(lsockets[i]);

     }

-#ifndef C_OS2

+#if !defined(C_OS2) && !defined(_WIN32)

     if(nlsockets && localsock) {

 	opt = optget(opts, "LocalSocket");

 	if(unlink(opt->strarg) == -1)

@@ -498,18 +477,6 @@ int main(int argc, char **argv)

     }

 #endif

-#ifdef C_WINDOWS

-    if(tcpsock)

-	WSACleanup();

-

-    if(!pthread_win32_process_detach_np()) {

-	logg("!Can't stop the win32 pthreads layer\n");

-	logg_close();

-	optfree(opts);

-	return 1;

-    }

-#endif

-

     logg_close();

     optfree(opts);

@@ -18,10 +18,6 @@

  *  MA 02110-1301, USA.

  */

-#ifdef	_MSC_VER

-#include <winsock.h>

-#endif

-

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

 #endif

@@ -87,7 +83,7 @@

 #include "others.h"

 #include "misc.h"

-#ifdef	C_WINDOWS

+#ifdef	_WIN32

 void virusaction(const char *filename, const char *virname, const struct optstruct *opts)

 {

     if(optget(opts, "VirusEvent")->enabled)

@@ -166,7 +162,7 @@ void virusaction(const char *filename, const char *virname, const struct optstru

 	free(buffer_file);

 	free(buffer_vir);

 }

-#endif /* C_WINDOWS */

+#endif /* _WIN32 */

 /* Function: writen

 	Try hard to write the specified number of bytes

@@ -421,9 +417,6 @@ void fds_remove(struct fd_data *data, int fd)

     fds_unlock(data);

 }

-#ifndef	C_WINDOWS

-#define	closesocket(s)	close(s)

-#endif

 #define BUFFSIZE 1024

 /* Wait till data is available to be read on any of the fds,

  * read available data on all fds, and mark them as appropriate.

@@ -18,10 +18,6 @@

  *  MA 02110-1301, USA.

  */

-#ifdef	_MSC_VER

-#include <winsock.h>

-#endif

-

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

 #endif

@@ -71,10 +67,6 @@

 dev_t procdev; /* /proc device */

 #endif

-#ifndef	C_WINDOWS

-#define	closesocket(s)	close(s)

-#endif

-

 extern int progexit;

 extern time_t reloaded_time;

 extern pthread_mutex_t reload_mutex;

@@ -19,10 +19,6 @@

  *  MA 02110-1301, USA.

  */

-#ifdef	_MSC_VER

-#include <winsock.h>

-#endif

-

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

 #endif

@@ -60,17 +56,7 @@

 #include "libclamav/readdb.h"

 #include "libclamav/cltypes.h"

-#ifndef	C_WINDOWS

-#define	closesocket(s)	close(s)

-#endif

-

 #define BUFFSIZE 1024

-#ifndef	FALSE

-#define FALSE (0)

-#endif

-#ifndef	TRUE

-#define TRUE (1)

-#endif

 int progexit = 0;

 pthread_mutex_t exit_mutex = PTHREAD_MUTEX_INITIALIZER;

@@ -18,10 +18,6 @@

  *  MA 02110-1301, USA.

  */

-#ifdef	_MSC_VER

-#include <winsock.h>

-#endif

-

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

 #endif

@@ -18,10 +18,6 @@

  *  MA 02110-1301, USA.

  */

-#ifdef	_MSC_VER

-#include <winsock.h>

-#endif

-

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

 #endif

@@ -52,9 +48,6 @@

 #include "server.h"

 #include "tcpserver.h"

 #include "misc.h"

-#ifndef	C_WINDOWS

-#define	closesocket(s)	close(s)

-#endif

 int tcpserver(const struct optstruct *opts)

 {

@@ -40,9 +40,6 @@

 #include <malloc.h>

 #endif

-#define FALSE (0)

-#define TRUE (1)

-

 /* BSD and HP-UX need a bigger stacksize than the system default */

 #if defined (C_BSD) || defined (C_HPUX) || defined(C_AIX)

 #define C_BIGSTACK 1

@@ -34,7 +34,9 @@

 #ifdef HAVE_SYS_LIMITS_H

 #include <sys/limits.h>

 #endif

+#ifdef HAVE_SYS_SELECT_H

 #include <sys/select.h>

+#endif

 #include <sys/un.h>

 #include <netinet/in.h>

 #include <arpa/inet.h>

@@ -82,6 +84,7 @@ static int isremote(const struct optstruct *opts) {

 	logg("!Can't parse clamd configuration file %s\n", clamd_conf);

 	return 0;

     }

+#ifndef _WIN32

     if((opt = optget(clamdopts, "LocalSocket"))->enabled) {

 	memset((void *)&nixsock, 0, sizeof(nixsock));

 	nixsock.sun_family = AF_UNIX;

@@ -92,6 +95,7 @@ static int isremote(const struct optstruct *opts) {

 	optfree(clamdopts);

 	return 0;

     }

+#endif

     if(!(opt = optget(clamdopts, "TCPSocket"))->enabled) {

 	optfree(clamdopts);

 	return 0;

@@ -34,7 +34,9 @@

 #include <fcntl.h>

 #include <sys/types.h>

 #include <sys/socket.h>

+#ifdef HAVE_SYS_SELECT_H

 #include <sys/select.h>

+#endif

 #include <arpa/inet.h>

 #include "libclamav/others.h"

@@ -54,10 +54,6 @@

 void help(void);

-#if defined(C_WINDOWS) && defined(CL_DEBUG)

-#include <crtdbg.h>

-#endif

-

 struct s_info info;

 short recursion = 0, printinfected = 0, bell = 0;

@@ -73,13 +69,6 @@ int main(int argc, char **argv)

 	struct optstruct *opts;

 	const struct optstruct *opt;

-#if defined(C_WINDOWS) && defined(CL_THREAD_SAFE)

-    if(!pthread_win32_process_attach_np()) {

-	mprintf("!Can't start the win32 pthreads layer\n");

-	return 72;

-    }

-#endif

-

 #if !defined(C_WINDOWS) && !defined(C_BEOS)

     sigemptyset(&sigset);

     sigaddset(&sigset, SIGXFSZ);

@@ -156,28 +145,14 @@ int main(int argc, char **argv)

     memset(&info, 0, sizeof(struct s_info));

-#ifdef C_WINDOWS

-    _set_fmode(_O_BINARY);

-#ifdef CL_DEBUG

-    {

-	_CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_FILE);

-	_CrtSetReportFile(_CRT_ERROR, _CRTDBG_FILE_STDERR);

-    }

-#endif	

-    gettimeofday(&t1, NULL);

-#else

     gettimeofday(&t1, &tz);

-#endif

     ret = scanmanager(opts);

     if(!optget(opts, "no-summary")->enabled) {

-#ifdef C_WINDOWS

-	gettimeofday(&t2, NULL);

-#else

 	gettimeofday(&t2, &tz);

-#endif

-	ds = t2.tv_sec - t1.tv_sec;

+

+    ds = t2.tv_sec - t1.tv_sec;

 	dms = t2.tv_usec - t1.tv_usec;

 	ds -= (dms < 0) ? (1):(0);

 	dms += (dms < 0) ? (1000000):(0);

@@ -202,13 +177,6 @@ int main(int argc, char **argv)

     optfree(opts);

-#if defined(C_WINDOWS) && defined(CL_THREAD_SAFE)

-    if(!pthread_win32_process_detach_np()) {

-	logg("!Can't stop the win32 pthreads layer\n");

-	return 72;

-    }

-#endif

-

     return ret;

 }

@@ -129,7 +129,7 @@ static int scanfile(const char *filename, struct cl_engine *engine, const struct

 	return 0;

     }

     info.rblocks += fsize / CL_COUNT_PRECISION;

-#ifndef C_WINDOWS

+#ifndef _WIN32

     if(geteuid())

 	if(checkaccess(filename, NULL, R_OK) != 1) {

 	    if(!printinfected)

@@ -141,7 +141,7 @@ static int scanfile(const char *filename, struct cl_engine *engine, const struct

     logg("*Scanning %s\n", filename);

     if((fd = open(filename, O_RDONLY|O_BINARY)) == -1) {

-	logg("^Can't open file %s\n", filename);

+	logg("^Can't open file %s: %s\n", filename, strerror(errno));

 	return 54;

     }

@@ -214,9 +214,7 @@ static int scandirs(const char *dirname, struct cl_engine *engine, const struct

     if((dd = opendir(dirname)) != NULL) {

 	while((dent = readdir(dd))) {

-#if !defined(C_INTERIX) && !defined(C_WINDOWS)

 	    if(dent->d_ino)

-#endif

 	    {

 		if(strcmp(dent->d_name, ".") && strcmp(dent->d_name, "..")) {

 		    /* build the full name */

@@ -73,7 +73,7 @@ int fileinfo(const char *filename, short i)

     }

 }

-#ifdef C_WINDOWS

+#ifdef _WIN32

 /* FIXME: Handle users correctly */

 int checkaccess(const char *path, const char *username, int mode)

 {

@@ -2563,6 +2563,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu

+

 ac_aux_dir=

 for ac_dir in config "$srcdir"/config; do

   for ac_t in install-sh install.sh shtool; do

@@ -5129,13 +5130,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :

 else

   lt_cv_nm_interface="BSD nm"

   echo "int some_variable = 0;" > conftest.$ac_ext

-  (eval echo "\"\$as_me:5132: $ac_compile\"" >&5)

+  (eval echo "\"\$as_me:5133: $ac_compile\"" >&5)

   (eval "$ac_compile" 2>conftest.err)

   cat conftest.err >&5

-  (eval echo "\"\$as_me:5135: $NM \\\"conftest.$ac_objext\\\"\"" >&5)

+  (eval echo "\"\$as_me:5136: $NM \\\"conftest.$ac_objext\\\"\"" >&5)

   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)

   cat conftest.err >&5

-  (eval echo "\"\$as_me:5138: output\"" >&5)

+  (eval echo "\"\$as_me:5139: output\"" >&5)

   cat conftest.out >&5

   if $GREP 'External.*some_variable' conftest.out > /dev/null; then

     lt_cv_nm_interface="MS dumpbin"

@@ -6330,7 +6331,7 @@ ia64-*-hpux*)

   ;;

 *-*-irix6*)

   # Find out which ABI we are using.

-  echo '#line 6333 "configure"' > conftest.$ac_ext

+  echo '#line 6334 "configure"' > conftest.$ac_ext

   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5

   (eval $ac_compile) 2>&5

   ac_status=$?

@@ -7859,11 +7860,11 @@ else

    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

    -e 's:$: $lt_compiler_flag:'`

-   (eval echo "\"\$as_me:7862: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:7863: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>conftest.err)

    ac_status=$?

    cat conftest.err >&5

-   echo "$as_me:7866: \$? = $ac_status" >&5

+   echo "$as_me:7867: \$? = $ac_status" >&5

    if (exit $ac_status) && test -s "$ac_outfile"; then

      # The compiler can only warn and ignore the option if not recognized

      # So say no if there are warnings other than the usual output.

@@ -8198,11 +8199,11 @@ else

    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

    -e 's:$: $lt_compiler_flag:'`

-   (eval echo "\"\$as_me:8201: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:8202: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>conftest.err)

    ac_status=$?

    cat conftest.err >&5

-   echo "$as_me:8205: \$? = $ac_status" >&5

+   echo "$as_me:8206: \$? = $ac_status" >&5

    if (exit $ac_status) && test -s "$ac_outfile"; then

      # The compiler can only warn and ignore the option if not recognized

      # So say no if there are warnings other than the usual output.

@@ -8303,11 +8304,11 @@ else

    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

    -e 's:$: $lt_compiler_flag:'`

-   (eval echo "\"\$as_me:8306: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:8307: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>out/conftest.err)

    ac_status=$?

    cat out/conftest.err >&5

-   echo "$as_me:8310: \$? = $ac_status" >&5

+   echo "$as_me:8311: \$? = $ac_status" >&5

    if (exit $ac_status) && test -s out/conftest2.$ac_objext

    then

      # The compiler can only warn and ignore the option if not recognized

@@ -8358,11 +8359,11 @@ else

    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

    -e 's:$: $lt_compiler_flag:'`

-   (eval echo "\"\$as_me:8361: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:8362: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>out/conftest.err)

    ac_status=$?

    cat out/conftest.err >&5

-   echo "$as_me:8365: \$? = $ac_status" >&5

+   echo "$as_me:8366: \$? = $ac_status" >&5

    if (exit $ac_status) && test -s out/conftest2.$ac_objext

    then

      # The compiler can only warn and ignore the option if not recognized

@@ -10741,7 +10742,7 @@ else

   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

   lt_status=$lt_dlunknown

   cat > conftest.$ac_ext <<_LT_EOF

-#line 10744 "configure"

+#line 10745 "configure"

 #include "confdefs.h"

 #if HAVE_DLFCN_H

@@ -10837,7 +10838,7 @@ else

   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

   lt_status=$lt_dlunknown

   cat > conftest.$ac_ext <<_LT_EOF

-#line 10840 "configure"

+#line 10841 "configure"

 #include "confdefs.h"

 #if HAVE_DLFCN_H

@@ -11509,7 +11510,7 @@ else

   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

   lt_status=$lt_dlunknown

   cat > conftest.$ac_ext <<_LT_EOF

-#line 11512 "configure"

+#line 11513 "configure"

 #include "confdefs.h"

 #if HAVE_DLFCN_H

@@ -22,6 +22,7 @@ dnl For a release change [devel] to the real version [0.xy]

 dnl also change VERSION below

 AC_INIT([ClamAV], [devel], [http://bugs.clamav.net/], [clamav], [http://www.clamav.net/])

+AH_BOTTOM([#include "platform.h"])

 dnl put configure auxiliary into config

 AC_CONFIG_AUX_DIR([config])

 AC_CONFIG_HEADER([clamav-config.h])

@@ -28,9 +28,6 @@

 #endif

 #include <string.h>

 #include <errno.h>

-#ifdef	C_WINDOWS

-#include <process.h>

-#endif

 #include "shared/output.h"

 #include "shared/optparser.h"

@@ -58,7 +55,7 @@ void execute( const char *type, const char *text, const struct optstruct *opts )

 	return;

     }

-#ifdef        C_WINDOWS

+#ifdef _WIN32

 	if(active_children < MAX_CHILDREN) {

 		if(spawnlp(P_DETACH, text, text, NULL) == -1) {

 			logg("^%s: couldn't execute \"%s\".\n", type, text);

@@ -15,9 +15,6 @@

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

  *  MA 02110-1301, USA.

  */

-#ifdef	_MSC_VER

-#include <winsock.h>

-#endif

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -131,9 +128,11 @@ static void help(void)

     mprintf("\n");

     mprintf("    --config-file=FILE                   read configuration from FILE.\n");

     mprintf("    --log=FILE           -l FILE         log into FILE\n");

+#ifndef _WIN32

     mprintf("    --daemon             -d              run in daemon mode\n");

     mprintf("    --pid=FILE           -p FILE         save daemon's pid in FILE\n");

     mprintf("    --user=USER          -u USER         run as USER\n");

+#endif

     mprintf("    --no-dns                             force old non-DNS verification method\n");

     mprintf("    --checks=#n          -c #n           number of checks per day, 1 <= n <= 50\n");

     mprintf("    --datadir=DIRECTORY                  download new databases into DIRECTORY\n");

@@ -239,14 +238,6 @@ int main(int argc, char **argv)

 	return 0;

     }

-#ifdef C_WINDOWS

-    if(!pthread_win32_process_attach_np()) {

-	mprintf("!Can't start the win32 pthreads layer\n");

-	optfree(opts);

-	return 63;

-    }

-#endif

-

     if(optget(opts, "HTTPProxyPassword")->enabled) {

 	if(stat(cfgfile, &statbuf) == -1) {

 	    logg("^Can't stat %s (critical error)\n", cfgfile);

@@ -254,7 +245,7 @@ int main(int argc, char **argv)

 	    return 56;

 	}

-#ifndef C_WINDOWS

+#ifndef _WIN32

 	if(statbuf.st_mode & (S_IRGRP | S_IWGRP | S_IXGRP | S_IROTH | S_IWOTH | S_IXOTH)) {

 	    logg("^Insecure permissions (for HTTPProxyPassword): %s must have no more than 0700 permissions.\n", cfgfile);

 	    optfree(opts);

@@ -263,7 +254,7 @@ int main(int argc, char **argv)

 #endif

     }

-#if !defined(C_OS2) && !defined(C_WINDOWS)

+#if !defined(C_OS2) && !defined(_WIN32)

     /* freshclam shouldn't work with root privileges */

     dbowner = optget(opts, "DatabaseOwner")->strarg;

@@ -378,18 +369,6 @@ int main(int argc, char **argv)

 	return 0;

     }

-#ifdef	C_WINDOWS

-    {

-	    WSADATA wsaData;

-

-	if(WSAStartup(MAKEWORD(2,2), &wsaData) != NO_ERROR) {

-	    logg("!Error at WSAStartup(): %d\n", WSAGetLastError());

-	    optfree(opts);

-	    return 1;

-	}

-    }

-#endif

-

     if(optget(opts, "daemon")->enabled) {

 	    int bigsleep, checks;

 #ifndef	C_WINDOWS

@@ -417,7 +396,7 @@ int main(int argc, char **argv)

 	bigsleep = 24 * 3600 / checks;

-#if !defined(C_OS2) && !defined(C_WINDOWS)

+#if !defined(C_OS2) && !defined(_WIN32)

 	if(!optget(opts, "Foreground")->enabled) {

 	    if(daemonize() == -1) {

 		logg("!daemonize() failed\n");

@@ -472,7 +451,7 @@ int main(int argc, char **argv)

 	    sigaction(SIGUSR1, &sigact, &oldact);

 #endif

-#ifdef	C_WINDOWS

+#ifdef	_WIN32

 	    sleep(bigsleep);

 #else   

 	    time(&wakeup);

@@ -525,14 +504,5 @@ int main(int argc, char **argv)

     optfree(opts);

-#ifdef C_WINDOWS

-    WSACleanup();

-

-    if(!pthread_win32_process_detach_np()) {

-	mprintf("!Can't stop the win32 pthreads layer\n");

-	return 63;

-    }

-#endif

-

     return(ret);

 }

@@ -22,9 +22,6 @@

  *  MA 02110-1301, USA.

  */

-#ifdef	_MSC_VER

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

-#endif

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

 #endif

@@ -59,9 +56,7 @@

 #include <time.h>

 #include <fcntl.h>

 #include <sys/stat.h>

-#ifndef C_WINDOWS

 #include <dirent.h>

-#endif

 #include <errno.h>

 #include <zlib.h>

@@ -85,14 +80,6 @@

 #include "libclamav/str.h"

 #include "libclamav/cvd.h"

-#ifndef	O_BINARY

-#define	O_BINARY	0

-#endif

-

-#ifndef C_WINDOWS

-#define	closesocket(s)	close(s)

-#endif

-

 #define CHDIR_ERR(x)				\

 	if(chdir(x) == -1)			\

 	    logg("!Can't chdir to %s\n", x);

@@ -1419,9 +1406,7 @@ static int buildcld(const char *tmpdir, const char *dbname, const char *newfile,

     }

     while((dent = readdir(dir))) {

-#if !defined(C_INTERIX) && !defined(C_WINDOWS)

 	if(dent->d_ino)

-#endif

 	{

 	    if(!strcmp(dent->d_name, ".") || !strcmp(dent->d_name, "..") || !strcmp(dent->d_name, "COPYING") || !strcmp(dent->d_name, "daily.cfg"))

 		continue;

@@ -1683,7 +1668,7 @@ static int updatedb(const char *dbname, const char *hostname, char *ip, int *sig

 	return 55; /* FIXME */

     }

-#ifdef C_WINDOWS

+#ifdef _WIN32

     if(!access(newdb, R_OK) && unlink(newdb)) {

 	logg("!Can't unlink %s. Please fix the problem manually and try again.\n", newdb);

 	unlink(newfile);

@@ -16,10 +16,6 @@

  *  MA 02110-1301, USA.

  */

-#ifdef	_MSC_VER

-#include <winsock.h>

-#endif

-

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

 #endif

@@ -15,9 +15,6 @@

  *  along with this program; if not, write to the Free Software

  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

  */

-#ifdef	_MSC_VER

-#include <winsock.h>

-#endif

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -15,11 +15,6 @@

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

  *  MA 02110-1301, USA.

  */

-#ifdef        _MSC_VER

-#include <windows.h>

-#include <winsock.h>

-#endif

-

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -45,10 +40,6 @@

 #include "shared/output.h"

 #include "notify.h"

-#ifndef	C_WINDOWS

-#define	closesocket(s)	close(s)

-#endif

-

 int notify(const char *cfgfile)

 {

 	char buff[20];

@@ -24,11 +24,6 @@ static	char	const	rcsid[] = "$Id: blob.c,v 1.64 2007/02/12 22:25:14 njh Exp $";

 #include "clamav-config.h"

 #endif

-#ifdef	C_WINDOWS

-#include "stdafx.h"

-#include <io.h>

-#endif

-

 #include <stdio.h>

 #include <stdlib.h>

 #include <string.h>

@@ -59,10 +54,6 @@ static	char	const	rcsid[] = "$Id: blob.c,v 1.64 2007/02/12 22:25:14 njh Exp $";

 #include <assert.h>

-#if	defined(C_MINGW) || defined(C_WINDOWS)

-#include <windows.h>

-#endif

-

 /* Scehduled for rewite in 0.94 (bb#804). Disabling for now */

 /* #define	MAX_SCAN_SIZE	20*1024	/\* */

 /* 				 * The performance benefit of scanning */

@@ -689,7 +680,7 @@ sanitiseName(char *name)

 		 * I don't know if spaces are legal in OS/2.

 		 */

 		if(strchr("%/*?<>|\\\"+=,;:\t ~", *name))

-#elif defined(C_WINDOWS)

+#elif defined(_WIN32)

 		if(strchr("%/*?<>|\\\"+=,;:\t~", *name))

 #else

 		if(*name == '/')

@@ -769,7 +769,7 @@ static int chm_decompress_stream(int fd, chm_metadata_t *metadata, const char *d

 	lzx_decompress(stream, length);

 	lzx_free(stream);

-#ifndef C_WINDOWS

+#ifndef _WIN32

 	/* Delete the file */

 	if(cli_unlink(filename))

 		retval = -1;

@@ -20,10 +20,6 @@

 static	char	const	rcsid[] = "$Id: mbox.c,v 1.381 2007/02/15 12:26:44 njh Exp $";

-#ifdef	_MSC_VER

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

-#endif

-

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

 #endif

@@ -54,9 +50,7 @@ static	char	const	rcsid[] = "$Id: mbox.c,v 1.381 2007/02/15 12:26:44 njh Exp $";

 #include <sys/param.h>

 #endif

 #include "clamav.h"

-#ifndef	C_WINDOWS

 #include <dirent.h>

-#endif

 #include <limits.h>

 #include <signal.h>

@@ -141,7 +135,7 @@ typedef	enum {

 #include "phishcheck.h"

-#ifndef	C_WINDOWS

+#ifndef	_WIN32

 #include <netdb.h>

 #include <sys/socket.h>

 #include <netinet/in.h>

@@ -151,10 +145,6 @@ typedef	enum {

 #endif

 #endif

-#ifndef	C_WINDOWS

-#define	closesocket(s)	close(s)

-#define	SOCKET	int

-#endif

 #include <fcntl.h>

 #ifndef	C_WINDOWS

@@ -169,16 +159,6 @@ typedef	unsigned	short	in_port_t;

 typedef	unsigned	int	in_addr_t;

 #endif

-#if	(!defined(EALREADY)) && (defined(WSAEALREADY))

-#define EALREADY	WSAEALREADY

-#endif

-#if	(!defined(EINPROGRESS)) && (defined(WSAEINPROGRESS))

-#define EINPROGRESS	WSAEINPROGRESS

-#endif

-#if	(!defined(EISCONN)) && (defined(WSAEISCONN))

-#define EISCONN	WSAEISCONN

-#endif

-

 /*

  * Use CL_SCAN_PARTIAL_MESSAGE to handle messages covered by section 7.3.2 of RFC1341.

  *	This is experimental code so it is up to YOU to (1) ensure it's secure

@@ -3826,10 +3806,9 @@ rfc1341(message *m, const char *dir)

 					int nblanks;

 					struct stat statb;

 					const char *dentry_idpart;

-#ifndef C_WINDOWS

+

 					if(dent->d_ino == 0)

 						continue;

-#endif

 					if(!strcmp(".",dent->d_name) ||

 							!strcmp("..", dent->d_name))

@@ -18,6 +18,9 @@

  *  MA 02110-1301, USA.

  */