_WIN32 ifdefs cleanup

--HG--
branch : WINDOWSPORT

src/common/conf_post.h

@@ -47,6 +47,7 @@ typedef int ssize_t;
 #define strncasecmp _strnicmp
 #define strcasecmp _stricmp
 #define ftruncate _chsize_s
+#define chdir _chdir
 #define PATH_MAX MAX_PATH
 #define MAXPATHLEN PATH_MAX
 #define R_OK 4

src/common/rclconfig.cpp

@@ -459,14 +459,10 @@ void RclConfig::initThrConf()
     if (vq.size() > 0 && vq[0] == 0) {
 	LOGDEB(("RclConfig::initThrConf: autoconf requested\n"));
 	CpuConf cpus;
-#ifdef _WIN32
-	cpus.ncpus = 1;
-#else
 	if (!getCpuConf(cpus) || cpus.ncpus < 1) {
 	    LOGERR(("RclConfig::initThrConf: could not retrieve cpu conf\n"));
 	    cpus.ncpus = 1;
 	}
-#endif
 	// Arbitrarily set threads config based on number of CPUS. This also
 	// depends on the IO setup actually, so we're bound to be wrong...
 	if (cpus.ncpus == 1) {

src/common/rclinit.cpp

@@ -31,9 +31,7 @@
 #include "pathut.h"
 #include "unac.h"
 #include "smallut.h"
-#ifndef _WIN32
 #include "execmd.h"
-#endif
 
 #ifndef _WIN32
 static const int catchedSigs[] = {SIGINT, SIGQUIT, SIGTERM, SIGUSR1, SIGUSR2};