From 45b76a9f0bed998cfb332ad387dec00356109c19 Mon Sep 17 00:00:00 2001
From: nijtmans <nijtmans>
Date: Mon, 31 May 2010 10:29:23 +0000
Subject: Fix CYGWIN warning: "fd_set and assiciated.macros have been defined
 in sys/types. This may cause runtime problems with W32"

---
 ChangeLog        |  5 +++++
 generic/tkMain.c | 10 +---------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3a17b93..8112893 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-31  Jan Nijtmans  <nijtmans@users.sf.net>
+
+	* generic/tkMain.c:  Fix CYGWIN warning: "fd_set and assiciated.macros
+	have been defined in sys/types. This may cause runtime problems with W32"
+
 2010-05-20  Donal K. Fellows  <dkf@users.sf.net>
 
 	* win/tkWinX.c (HandleIMEComposition): [Bug 2992129]: Ensure that all
diff --git a/generic/tkMain.c b/generic/tkMain.c
index a97e282..b2279be 100644
--- a/generic/tkMain.c
+++ b/generic/tkMain.c
@@ -13,19 +13,11 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkMain.c,v 1.28.2.1 2009/10/15 17:48:50 dgp Exp $
+ * RCS: @(#) $Id: tkMain.c,v 1.28.2.2 2010/05/31 10:29:29 nijtmans Exp $
  */
 
-#include <ctype.h>
-#include <stdio.h>
-#include <string.h>
 #include "tclInt.h"
 #include "tkInt.h"
-#ifdef NO_STDLIB_H
-#   include "../compat/stdlib.h"
-#else
-#   include <stdlib.h>
-#endif
 #ifdef __WIN32__
 #include "tkWinInt.h"
 #endif
-- 
cgit v0.12