summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--generic/tk3d.h4
-rw-r--r--generic/tkColor.h4
-rw-r--r--generic/tkInt.h8
-rw-r--r--xlib/xcolors.c4
-rw-r--r--xlib/xgc.c4
6 files changed, 14 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog
index 9efa95d..8e9ebfb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@
* win/tkWinPort.h might go off before the inclusion of <tchar.h>
* compat/stdlib.h Include <tcl.h> only when not already done.
* compat/unistd.h
+ * generic/tkInt.h tkPort.h already includes tk.h, which includes tcl.h
+ * generic/tk3d.h Always use #include "tkInt.h", not <tkInt.h>
+ * generic/tkColor.h
+ * xlib/xcolors.c
+ * xlib/xgc.c
2010-04-19 Jan Nijtmans <nijtmans@users.sf.net>
diff --git a/generic/tk3d.h b/generic/tk3d.h
index eabab7a..b03af94 100644
--- a/generic/tk3d.h
+++ b/generic/tk3d.h
@@ -8,13 +8,13 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tk3d.h,v 1.8 2008/10/09 09:42:50 dkf Exp $
+ * RCS: @(#) $Id: tk3d.h,v 1.9 2010/04/20 15:14:29 nijtmans Exp $
*/
#ifndef _TK3D
#define _TK3D
-#include <tkInt.h>
+#include "tkInt.h"
#ifdef BUILD_tk
# undef TCL_STORAGE_CLASS
diff --git a/generic/tkColor.h b/generic/tkColor.h
index c61579e..36b5ec1 100644
--- a/generic/tkColor.h
+++ b/generic/tkColor.h
@@ -8,13 +8,13 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkColor.h,v 1.11 2007/12/13 15:24:13 dgp Exp $
+ * RCS: @(#) $Id: tkColor.h,v 1.12 2010/04/20 15:14:29 nijtmans Exp $
*/
#ifndef _TKCOLOR
#define _TKCOLOR
-#include <tkInt.h>
+#include "tkInt.h"
#ifdef BUILD_tk
#undef TCL_STORAGE_CLASS
diff --git a/generic/tkInt.h b/generic/tkInt.h
index f0bf85d..3af90c0 100644
--- a/generic/tkInt.h
+++ b/generic/tkInt.h
@@ -11,18 +11,12 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: $Id: tkInt.h,v 1.120 2010/01/22 14:17:53 nijtmans Exp $
+ * RCS: $Id: tkInt.h,v 1.121 2010/04/20 15:14:29 nijtmans Exp $
*/
#ifndef _TKINT
#define _TKINT
-#ifndef _TK
-#include "tk.h"
-#endif
-#ifndef _TCL
-#include "tcl.h"
-#endif
#ifndef _TKPORT
#include "tkPort.h"
#endif
diff --git a/xlib/xcolors.c b/xlib/xcolors.c
index 4122b86..90a9a9a 100644
--- a/xlib/xcolors.c
+++ b/xlib/xcolors.c
@@ -9,10 +9,10 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: xcolors.c,v 1.8 2008/10/17 23:18:38 nijtmans Exp $
+ * RCS: @(#) $Id: xcolors.c,v 1.9 2010/04/20 15:14:30 nijtmans Exp $
*/
-#include <tkInt.h>
+#include "tkInt.h"
/*
* This value will be set to the number of colors in the color table
diff --git a/xlib/xgc.c b/xlib/xgc.c
index eaeec32..a2a7087 100644
--- a/xlib/xgc.c
+++ b/xlib/xgc.c
@@ -11,10 +11,10 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: xgc.c,v 1.17 2009/06/29 14:35:01 das Exp $
+ * RCS: @(#) $Id: xgc.c,v 1.18 2010/04/20 15:14:30 nijtmans Exp $
*/
-#include <tkInt.h>
+#include "tkInt.h"
#if !defined(MAC_OSX_TK)
# include <X11/Xlib.h>