From 15c8ca97cecaaedbc5142e59f1e5981e78e39fc1 Mon Sep 17 00:00:00 2001
From: CaS <CaS@72102866-910b-0410-8b05-ffd578937521>
Date: Mon, 21 Feb 2005 14:44:18 +0000
Subject: [PATCH] Clean up a bit

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@20771 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog      |  1 +
 Tools/gdomap.c | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index d7912ae18..46e3754c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@
 	* Source/callframe.m:
 	* Source/cifframe.m:
 	Include malloc.h for systems where it is needed for alloca()
+	* Tools/gdomap.c: Avoid some warnings on mingw32
 
 M Source/mframe/mframe.head
 2005-02-21 14:10 Stefan Urbanek <stefan@agentfarms.net>
diff --git a/Tools/gdomap.c b/Tools/gdomap.c
index e725d31a2..c825597f1 100644
--- a/Tools/gdomap.c
+++ b/Tools/gdomap.c
@@ -129,7 +129,9 @@
 #define	MAX_EXTRA	((GDO_NAME_MAX_LEN - 2 * IASIZE)/IASIZE)
 
 typedef	unsigned char	*uptr;
+#ifndef __MINGW__
 static int	is_daemon = 0;		/* Currently running as daemon.	 */
+#endif
 static int	debug = 0;		/* Extra debug gdomap_logging.	 */
 static int	nobcst = 0;		/* turn off broadcast probing.	 */
 static int	nofork = 0;		/* turn off fork() for debugging. */
@@ -159,7 +161,9 @@ struct in_addr	class_c_mask;
  *	Predeclare some of the functions used.
  */
 static void	dump_stats();
+#ifndef __MINGW__
 static void	dump_tables();
+#endif
 static void	handle_accept();
 static void	handle_io();
 static void	handle_read(int);
@@ -1030,6 +1034,7 @@ dump_stats()
   gdomap_log(LOG_INFO);
 }
 
+#ifndef __MINGW__
 static void
 dump_tables()
 {
@@ -1066,6 +1071,7 @@ dump_tables()
       gdomap_log(LOG_ERR);
     }
 }
+#endif
 
 /*
  *	Name -		init_iface()
@@ -4569,7 +4575,7 @@ printf(
 	}
       a[argc] = "-f";
       a[argc+1] = 0;
-      if (_spawnv(_P_NOWAIT, argv[0], a) == -1)
+      if (_spawnv(_P_NOWAIT, argv[0], (const char* const*)a) == -1)
 	{
 	  fprintf(stderr, "gdomap - spawn '%s' failed - bye.\n", argv[0]);
 	  exit(EXIT_FAILURE);
@@ -4725,8 +4731,10 @@ printf(
 #endif
     }
 {
+#ifndef __MINGW__
   int uid = -2;
   int gid = -2;
+#endif
 
 #ifdef	HAVE_PWD_H
 #ifdef	HAVE_GETPWNAM