--- deliantra/server/common/porting.C	2006/09/12 23:22:32	1.6
+++ deliantra/server/common/porting.C	2006/12/11 19:46:46	1.9
@@ -1,9 +1,3 @@
-
-/*
- * static char *rcsid_porting_c =
- *   "$Id: porting.C,v 1.6 2006/09/12 23:22:32 root Exp $";
- */
-
 /*
     CrossFire, A Multiplayer game for X-windows
 
@@ -24,7 +18,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    The authors can be reached via e-mail at crossfire-devel@real-time.com
+    The authors can be reached via e-mail at <crossfire@schmorp.de>
 */
 
 /* This file contains various functions that are not really unique for
@@ -35,22 +29,16 @@
  */
 
 
-#ifdef WIN32                    /* ---win32 exclude/include headers */
-# include "process.h"
-# define pid_t int              /* we include it non global, because there is a redefinition in python.h */
-#else
-# include <ctype.h>
-# include <sys/stat.h>
-# include <sys/wait.h>
+#include <ctype.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
 
-# include <sys/param.h>
-# include <stdio.h>
+#include <sys/param.h>
+#include <stdio.h>
 
 /* Need to pull in the HAVE_... values somehow */
 
-/* win32 reminder: always put this in a ifndef win32 block */
-# include <autoconf.h>
-#endif
+#include <autoconf.h>
 
 
 #ifdef HAVE_STDLIB_H
@@ -390,9 +378,6 @@
 FILE *
 open_and_uncompress (const char *name, int flag, int *compressed)
 {
-  size_t i;
-  FILE *fp;
-
   *compressed = 0;
   return fopen (name, "r");
 }