--- deliantra/server/include/config.h	2006/12/11 19:46:46	1.22
+++ deliantra/server/include/config.h	2006/12/14 21:46:34	1.24
@@ -68,7 +68,6 @@
  * MAX_TIME - how long an internal tick is in microseconds
  * MANY_CORES - generate core dumps on gross errors instead of continuing?
  * PARTY_KILL_LOG - stores party kill information
- * WATCHDOG - allows use of an external watchdog program
  *
  ***********************************************************************/
 
@@ -255,15 +254,6 @@
 #define PERM_EXP_GAIN_RATIO           0.10f
 #define PERM_EXP_MAX_LOSS_RATIO       0.50f
 
-/*
- * WATCHDOG lets sends datagrams to port 13325 on localhost
- * in (more-or-less) regular intervals, so an external watchdog
- * program can kill the server if it hangs (for whatever reason).
- * It shouldn't hurt anyone if this is defined but you don't
- * have an watchdog program.
- */
-#define WATCHDOG
-
 /* Enable the new material code - it needs some work.  You can
  * enable this, and things will work, just you'll see a whole
  * bunch more materials show up, and thus a whole bunch more materials
@@ -335,7 +325,6 @@
  *    backlogged messages.
  * TMPDIR - directory to use for temp files
  * UNIQUE_DIR - directory to put unique item files into
- * USE_CALLOC for some memory requests
  ***********************************************************************
  */
 
@@ -540,21 +529,6 @@
 #define UNIQUE_DIR "unique-items"
 
 /*
- * If undefined, malloc is always used.
- * It looks like this can be oboleted.  However, it can be useful to
- * track down some bugs, as it will make sure that the entire data structure
- * is set to 0, at the expense of speed.
- * Rupert Goldie has run Purify against the code, and if this is disabled,
- * apparantly there are a lot of uninitialized memory reads - I haven't
- * seen any problem (maybe the memory reads are copies, and the destination
- * doesn't actually use the garbage values either?), but the impact on speed
- * of using this probably isn't great, and should make things more stable.
- * Msw 8-9-97
- */
-#define USE_CALLOC
-
-
-/*
  * These define the players starting map and location on that map, and where
  * emergency saves are defined.  This should be left as is unless you make
  * major changes to the map.