--- deliantra/server/server/init.C	2006/10/02 15:28:36	1.15
+++ deliantra/server/server/init.C	2006/12/11 19:46:47	1.16
@@ -213,13 +213,11 @@
 set_csport (char *val)
 {
   settings.csport = atoi (val);
-#ifndef WIN32                   /* ***win32: set_csport: we remove csport error secure check here, do this later */
   if (settings.csport <= 0 || settings.csport > 32765 || (settings.csport < 1024 && getuid () != 0))
     {
       LOG (llevError, "%d is an invalid csport number.\n", settings.csport);
       exit (1);
     }
-#endif /* win32 */
 }
 
 /* Most of this is shamelessly stolen from XSysStats.  But since that is
@@ -268,14 +266,6 @@
   {"-tmpdir", 1, 1, (void (*)()) set_tmpdir},
   {"-log", 1, 1, (void (*)()) set_logfile},
 
-#ifdef WIN32
-
-/* Windows service stuff */
-  {"-regsrv", 0, 1, service_register},
-  {"-unregsrv", 0, 1, service_unregister},
-  {"-srv", 0, 1, service_handle},
-#endif
-
 /* Pass 2 functions.  Most of these could probably be in pass 1, 
  * as they don't require much of anything to bet set up.
  */
@@ -1075,10 +1065,8 @@
 
   parse_args (argc, argv, 3);
 
-#ifndef WIN32                   /* ***win32: no BecomeDaemon in windows */
   if (settings.daemonmode)
     logfile = BecomeDaemon (settings.logfilename[0] == '\0' ? "logfile" : settings.logfilename);
-#endif
 
   init_beforeplay ();
   init_ericserver ();
@@ -1266,14 +1254,9 @@
 
   printf ("Max_time:\t%d\n", MAX_TIME);
 
-#ifdef WIN32                    /* ***win32 compile_info(): remove execl... */
-  printf ("Logfilename:\t%s\n", settings.logfilename);
-  exit (0);
-#else
   execl ("/bin/uname", "uname", "-a", NULL);
   LOG (llevError, "Oops, shouldn't have gotten here: execl(/bin/uname) failed: %s\n", strerror (errno));
   exit (-1);
-#endif
 }
 
 /* Signal handlers: */
@@ -1343,17 +1326,15 @@
 void
 init_signals (void)
 {
-#ifndef WIN32                   /* init_signals() remove signals */
   signal (SIGHUP, rec_sighup);
   signal (SIGINT, rec_sigint);
   signal (SIGQUIT, rec_sigquit);
   signal (SIGSEGV, rec_sigsegv);
   signal (SIGPIPE, SIG_IGN);
-# ifdef SIGBUS
+#ifdef SIGBUS
   signal (SIGBUS, rec_sigbus);
-# endif
-  signal (SIGTERM, rec_sigterm);
 #endif
+  signal (SIGTERM, rec_sigterm);
 }
 
 /* init_races() - reads the races file in the lib/ directory, then