--- deliantra/server/include/config.h	2006/11/26 19:48:49	1.21
+++ deliantra/server/include/config.h	2006/12/11 19:46:46	1.22
@@ -160,22 +160,16 @@
  * which contains usage stats for the last X amount of time.
  * CS_LOGTIME is how often it will print out stats.
  */
-#ifndef WIN32    /* ***win32 we set the following stuff in the IDE */
 #define CS_LOGSTATS
-#endif
-#ifdef CS_LOGSTATS
 #define CS_LOGTIME  600
-#endif
 
 /* DEBUG generates copious amounts of output.  I tend to change the CC options
  * in the crosssite.def file if I want this.  By default, you probably
  * dont want this defined.
  */
-#ifndef WIN32			/* ***win32 we set the following stuff in the IDE */
 #ifndef DEBUG
 #define DEBUG
 #endif
-#endif
 /*
  * This option creates more core files.  In some areas, there are certain
  * checks done to try and make the program more stable (ie, check
@@ -268,10 +262,7 @@
  * It shouldn't hurt anyone if this is defined but you don't
  * have an watchdog program.
  */
-#ifndef WIN32	/* ***win32 disable watchdog as win32 default */
 #define WATCHDOG
-#endif
-
 
 /* Enable the new material code - it needs some work.  You can
  * enable this, and things will work, just you'll see a whole
@@ -380,12 +371,8 @@
  */
 
 #ifndef LOGFILE
-#ifdef WIN32 /* change define path */
-#define LOGFILE "var\\crossfire.log"
-#else 
 #define LOGFILE "/var/log/crossfire/logfile"
 #endif
-#endif
 
 /*
  * MAP_MAXTIMEOUT tells the maximum of ticks until a map is swapped out
@@ -543,11 +530,7 @@
  */
 
 /*#define TMPDIR "/home/hugin/a/crossfire/crossfire/tmp"*/
-#ifdef WIN32 /* change define path tmp */
-#define TMPDIR "tmp"
-#else
 #define TMPDIR "/tmp"
-#endif
 
 
 /* Directory to use for unique items. This is placed into the 'lib' 
@@ -577,16 +560,9 @@
  * major changes to the map.
  */
 
-#ifdef WIN32 /* change define path city */
-
-#  define EMERGENCY_MAPPATH "\\city\\city"
-#  define EMERGENCY_X 15
-#  define EMERGENCY_Y 19
-#else
-#  define EMERGENCY_MAPPATH "/city/city"
-#  define EMERGENCY_X 15
-#  define EMERGENCY_Y 19
-#endif
+#define EMERGENCY_MAPPATH "/city/city"
+#define EMERGENCY_X 15
+#define EMERGENCY_Y 19
 
 
 /*