From 3ec5feb3637f136b6c659eb42c52100c41f2e8ca Mon Sep 17 00:00:00 2001
From: nijtmans <nijtmans>
Date: Mon, 25 Jan 2010 20:26:18 +0000
Subject: Remove double includes (which causes a warning in CYGWIN compiles)
 Add confdefs.h to unix/.cvsignore

---
 ChangeLog               | 6 ++++++
 generic/tclOOStubInit.c | 3 +--
 generic/tclOOStubLib.c  | 4 +---
 unix/.cvsignore         | 1 +
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b35dc5d..86c49d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-25  Jan Nijtmans  <nijtmans@users.sf.net>
+
+	* generic/tclOOStubInit.c    Remove double includes (which causes a
+	* generic/tclOOStubLib.c     warning in CYGWIN compiles)
+	* unix/.cvsignore            add confdefs.h
+
 2010-01-22  Donal K. Fellows  <dkf@users.sf.net>
 
 	* doc/proc.n: [Bug 1970629]: Define a bit better what the current
diff --git a/generic/tclOOStubInit.c b/generic/tclOOStubInit.c
index 4ec3992..3039aa2 100644
--- a/generic/tclOOStubInit.c
+++ b/generic/tclOOStubInit.c
@@ -1,5 +1,5 @@
 /*
- * $Id: tclOOStubInit.c,v 1.7 2009/07/19 11:46:53 dkf Exp $
+ * $Id: tclOOStubInit.c,v 1.8 2010/01/25 20:26:18 nijtmans Exp $
  *
  * This file is (mostly) automatically generated from tclOO.decls.
  * It is compiled and linked in with the tclOO package proper.
@@ -8,7 +8,6 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#include "tclOO.h"
 #include "tclOOInt.h"
 
 /* !BEGIN!: Do not edit below this line. */
diff --git a/generic/tclOOStubLib.c b/generic/tclOOStubLib.c
index 0414ae4..5a8c743 100644
--- a/generic/tclOOStubLib.c
+++ b/generic/tclOOStubLib.c
@@ -1,5 +1,5 @@
 /*
- * $Id: tclOOStubLib.c,v 1.4 2008/06/12 06:29:18 das Exp $
+ * $Id: tclOOStubLib.c,v 1.5 2010/01/25 20:26:18 nijtmans Exp $
  * ORIGINAL SOURCE: tk/generic/tkStubLib.c, version 1.9 2004/03/17
  */
 
@@ -14,10 +14,8 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#include "tcl.h"
 
 #define USE_TCLOO_STUBS 1
-#include "tclOO.h"
 #include "tclOOInt.h"
 
 MODULE_SCOPE const TclOOStubs *tclOOStubsPtr;
diff --git a/unix/.cvsignore b/unix/.cvsignore
index 4c52a50..9f2e617 100644
--- a/unix/.cvsignore
+++ b/unix/.cvsignore
@@ -15,3 +15,4 @@ tclsh
 tcltest
 test1
 test2
+confdefs.h
-- 
cgit v0.12