c84b_OSX1.patch8¼ºº¥¼ºÇ=mBIN*Index: compat/dirent2.h
===================================================================
RCS file: /cvsroot/tcl/tcl/compat/dirent2.h,v
retrieving revision 1.2
diff -u -p -r1.2 dirent2.h
--- compat/dirent2.h	14 Sep 1998 18:39:44 -0000	1.2
+++ compat/dirent2.h	2 May 2004 18:20:05 -0000
@@ -16,9 +16,7 @@
 #ifndef _DIRENT
 #define _DIRENT
 
-#ifndef _TCL
 #include <tcl.h>
-#endif
 
 /*
  * Dirent structure, which holds information about a single
Index: compat/dlfcn.h
===================================================================
RCS file: /cvsroot/tcl/tcl/compat/dlfcn.h,v
retrieving revision 1.2
diff -u -p -r1.2 dlfcn.h
--- compat/dlfcn.h	14 Sep 1998 18:39:44 -0000	1.2
+++ compat/dlfcn.h	2 May 2004 18:20:05 -0000
@@ -29,9 +29,7 @@
 #ifndef __dlfcn_h__
 #define __dlfcn_h__
 
-#ifndef _TCL
 #include <tcl.h>
-#endif
 
 #ifdef __cplusplus
 extern "C" {
Index: compat/strftime.c
===================================================================
RCS file: /cvsroot/tcl/tcl/compat/strftime.c,v
retrieving revision 1.10
diff -u -p -r1.10 strftime.c
--- compat/strftime.c	29 May 2002 00:19:39 -0000	1.10
+++ compat/strftime.c	2 May 2004 18:20:08 -0000
@@ -50,11 +50,11 @@
 static char *rcsid = "$Id: strftime.c,v 1.10 2002/05/29 00:19:39 hobbs Exp $";
 #endif /* LIBC_SCCS */
 
+#include "tclInt.h"
+#include "tclPort.h"
 #include <time.h>
 #include <string.h>
 #include <locale.h>
-#include "tclInt.h"
-#include "tclPort.h"
 
 #define TM_YEAR_BASE   1900
 #define IsLeapYear(x)   ((x % 4 == 0) && (x % 100 != 0 || x % 400 == 0))
Index: compat/strtol.c
===================================================================
RCS file: /cvsroot/tcl/tcl/compat/strtol.c,v
retrieving revision 1.4
diff -u -p -r1.4 strtol.c
--- compat/strtol.c	25 Feb 2002 16:23:26 -0000	1.4
+++ compat/strtol.c	2 May 2004 18:20:08 -0000
@@ -12,9 +12,9 @@
  * RCS: @(#) $Id: strtol.c,v 1.4 2002/02/25 16:23:26 dgp Exp $
  */
 
-#include <ctype.h>
 #include "tclInt.h"
 #include "tclPort.h"
+#include <ctype.h>
 
 
 /*
Index: compat/unistd.h
===================================================================
RCS file: /cvsroot/tcl/tcl/compat/unistd.h,v
retrieving revision 1.2
diff -u -p -r1.2 unistd.h
--- compat/unistd.h	14 Sep 1998 18:39:45 -0000	1.2
+++ compat/unistd.h	2 May 2004 18:20:09 -0000
@@ -19,12 +19,10 @@
 #define _UNISTD
 
 #include <sys/types.h>
-#ifndef _TCL
-#   include "tcl.h"
-#endif
+#include "tcl.h"
 
 #ifndef NULL
-#define NULL    0
+#  define NULL    0
 #endif
 
 /* 
Index: generic/tclAlloc.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclAlloc.c,v
retrieving revision 1.16
diff -u -p -r1.16 tclAlloc.c
--- generic/tclAlloc.c	23 Apr 2002 17:03:34 -0000	1.16
+++ generic/tclAlloc.c	2 May 2004 18:20:14 -0000
@@ -23,10 +23,10 @@
  * that has significantly reduced lock contention.
  */
 
-#if !defined(TCL_THREADS) || !defined(USE_THREAD_ALLOC)
-
 #include "tclInt.h"
 #include "tclPort.h"
+
+#if !defined(TCL_THREADS) || !defined(USE_THREAD_ALLOC)
 
 #if USE_TCLALLOC
 
Index: generic/tclClock.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclClock.c,v
retrieving revision 1.20
diff -u -p -r1.20 tclClock.c
--- generic/tclClock.c	1 Feb 2003 21:27:55 -0000	1.20
+++ generic/tclClock.c	2 May 2004 18:20:16 -0000
@@ -14,7 +14,6 @@
  * RCS: @(#) $Id: tclClock.c,v 1.20 2003/02/01 21:27:55 kennykb Exp $
  */
 
-#include "tcl.h"
 #include "tclInt.h"
 #include "tclPort.h"
 
Index: generic/tclCompile.h
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclCompile.h,v
retrieving revision 1.33
diff -u -p -r1.33 tclCompile.h
--- generic/tclCompile.h	9 Oct 2002 11:54:05 -0000	1.33
+++ generic/tclCompile.h	2 May 2004 18:20:23 -0000
@@ -14,9 +14,7 @@
 #ifndef _TCLCOMPILATION
 #define _TCLCOMPILATION 1
 
-#ifndef _TCLINT
 #include "tclInt.h"
-#endif /* _TCLINT */
 
 #ifdef BUILD_tcl
 # undef TCL_STORAGE_CLASS
Index: generic/tclInt.h
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclInt.h,v
retrieving revision 1.118.2.4
diff -u -p -r1.118.2.4 tclInt.h
--- generic/tclInt.h	29 Mar 2004 18:49:36 -0000	1.118.2.4
+++ generic/tclInt.h	2 May 2004 18:20:43 -0000
@@ -28,10 +28,7 @@
  * needed by stdlib.h in some configurations.
  */
 
-#ifndef _TCL
 #include "tcl.h"
-#endif
-
 #include <stdio.h>
 
 #include <ctype.h>
Index: generic/tclInterp.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclInterp.c,v
retrieving revision 1.20.2.2
diff -u -p -r1.20.2.2 tclInterp.c
--- generic/tclInterp.c	12 May 2003 22:35:40 -0000	1.20.2.2
+++ generic/tclInterp.c	2 May 2004 18:20:58 -0000
@@ -14,7 +14,6 @@
 
 #include "tclInt.h"
 #include "tclPort.h"
-#include <stdio.h>
 
 /*
  * Counter for how many aliases were created (global)
Index: generic/tclMain.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclMain.c,v
retrieving revision 1.20
diff -u -p -r1.20 tclMain.c
--- generic/tclMain.c	29 May 2002 22:59:33 -0000	1.20
+++ generic/tclMain.c	2 May 2004 18:21:01 -0000
@@ -13,7 +13,6 @@
  * RCS: @(#) $Id: tclMain.c,v 1.20 2002/05/29 22:59:33 dgp Exp $
  */
 
-#include "tcl.h"
 #include "tclInt.h"
 
 # undef TCL_STORAGE_CLASS
Index: generic/tclTest.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclTest.c,v
retrieving revision 1.62.2.7
diff -u -p -r1.62.2.7 tclTest.c
--- generic/tclTest.c	1 Mar 2004 17:33:21 -0000	1.62.2.7
+++ generic/tclTest.c	2 May 2004 18:21:31 -0000
@@ -17,7 +17,6 @@
  * RCS: @(#) $Id: tclTest.c,v 1.62.2.7 2004/03/01 17:33:21 dgp Exp $
  */
 
-#define TCL_TEST
 #include "tclInt.h"
 #include "tclPort.h"
 
Index: generic/tclThreadAlloc.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclThreadAlloc.c,v
retrieving revision 1.4.2.2
diff -u -p -r1.4.2.2 tclThreadAlloc.c
--- generic/tclThreadAlloc.c	10 May 2003 04:57:40 -0000	1.4.2.2
+++ generic/tclThreadAlloc.c	2 May 2004 18:21:34 -0000
@@ -14,9 +14,9 @@
  * RCS: @(#) $Id: tclThreadAlloc.c,v 1.4.2.2 2003/05/10 04:57:40 mistachkin Exp $ 
  */
 
-#if defined(TCL_THREADS) && defined(USE_THREAD_ALLOC)
-
 #include "tclInt.h"
+
+#if defined(TCL_THREADS) && defined(USE_THREAD_ALLOC)
 
 #ifdef WIN32
 #include "tclWinInt.h"
Index: mac/MW_TclHeaderCommon.h
===================================================================
RCS file: /cvsroot/tcl/tcl/mac/Attic/MW_TclHeaderCommon.h,v
retrieving revision 1.2
diff -u -p -r1.2 MW_TclHeaderCommon.h
--- mac/MW_TclHeaderCommon.h	23 Nov 2001 01:29:29 -0000	1.2
+++ mac/MW_TclHeaderCommon.h	2 May 2004 18:21:36 -0000
@@ -20,7 +20,7 @@
  * and is OK to be in any file in the system.
  */
 
-#include "tcl.h"
+#include "tclInt.h"
 
 #ifdef BUILD_tcl
 # undef TCL_STORAGE_CLASS
@@ -30,7 +30,6 @@
 #undef TCL_STORAGE_CLASS
 #define TCL_STORAGE_CLASS DLLIMPORT
 
-#include "tclInt.h"
 
 
 #if PRAGMA_IMPORT
Index: mac/tclMac.h
===================================================================
RCS file: /cvsroot/tcl/tcl/mac/Attic/tclMac.h,v
retrieving revision 1.5
diff -u -p -r1.5 tclMac.h
--- mac/tclMac.h	23 Nov 2001 01:27:05 -0000	1.5
+++ mac/tclMac.h	2 May 2004 18:21:36 -0000
@@ -14,9 +14,7 @@
 #ifndef _TCLMAC
 #define _TCLMAC
 
-#ifndef _TCL
-#   include "tcl.h"
-#endif
+#include "tcl.h"
 #include <Types.h>
 #include <Files.h>
 #include <Events.h>
Index: mac/tclMacAppInit.c
===================================================================
RCS file: /cvsroot/tcl/tcl/mac/Attic/tclMacAppInit.c,v
retrieving revision 1.9
diff -u -p -r1.9 tclMacAppInit.c
--- mac/tclMacAppInit.c	23 Nov 2001 01:27:13 -0000	1.9
+++ mac/tclMacAppInit.c	2 May 2004 18:21:37 -0000
@@ -12,7 +12,6 @@
  * RCS: @(#) $Id: tclMacAppInit.c,v 1.9 2001/11/23 01:27:13 das Exp $
  */
 
-#include "tcl.h"
 #include "tclInt.h"
 #include "tclPort.h"
 #include "tclMac.h"
Index: mac/tclMacBOAAppInit.c
===================================================================
RCS file: /cvsroot/tcl/tcl/mac/Attic/tclMacBOAAppInit.c,v
retrieving revision 1.5
diff -u -p -r1.5 tclMacBOAAppInit.c
--- mac/tclMacBOAAppInit.c	14 Jun 2001 00:48:51 -0000	1.5
+++ mac/tclMacBOAAppInit.c	2 May 2004 18:21:38 -0000
@@ -12,7 +12,6 @@
  * RCS: @(#) $Id: tclMacBOAAppInit.c,v 1.5 2001/06/14 00:48:51 dgp Exp $
  */
 
-#include "tcl.h"
 #include "tclInt.h"
 #include "tclPort.h"
 #include "tclMac.h"
Index: mac/tclMacBOAMain.c
===================================================================
RCS file: /cvsroot/tcl/tcl/mac/Attic/tclMacBOAMain.c,v
retrieving revision 1.4
diff -u -p -r1.4 tclMacBOAMain.c
--- mac/tclMacBOAMain.c	28 Dec 2001 23:36:31 -0000	1.4
+++ mac/tclMacBOAMain.c	2 May 2004 18:21:40 -0000
@@ -11,7 +11,6 @@
  * RCS: @(#) $Id: tclMacBOAMain.c,v 1.4 2001/12/28 23:36:31 dgp Exp $
  */
 
-#include "tcl.h"
 #include "tclInt.h"
 #include "tclMacInt.h"
 #include <Resources.h>
Index: mac/tclMacEnv.c
===================================================================
RCS file: /cvsroot/tcl/tcl/mac/Attic/tclMacEnv.c,v
retrieving revision 1.2
diff -u -p -r1.2 tclMacEnv.c
--- mac/tclMacEnv.c	14 Sep 1998 18:40:04 -0000	1.2
+++ mac/tclMacEnv.c	2 May 2004 18:21:42 -0000
@@ -17,7 +17,6 @@
 #include <Resources.h>
 #include <string.h>
 
-#include "tcl.h"
 #include "tclInt.h"
 #include "tclMacInt.h"
 #include "tclPort.h"
Index: mac/tclMacInt.h
===================================================================
RCS file: /cvsroot/tcl/tcl/mac/Attic/tclMacInt.h,v
retrieving revision 1.7
diff -u -p -r1.7 tclMacInt.h
--- mac/tclMacInt.h	23 Nov 2001 01:27:36 -0000	1.7
+++ mac/tclMacInt.h	2 May 2004 18:21:43 -0000
@@ -14,13 +14,8 @@
 #ifndef _TCLMACINT
 #define _TCLMACINT
 
-#ifndef _TCLINT
 #include "tclInt.h"
-#endif
-#ifndef _TCLPORT
 #include "tclPort.h"
-#endif
-
 #include <Events.h>
 #include <Files.h>
 
Index: mac/tclMacLoad.c
===================================================================
RCS file: /cvsroot/tcl/tcl/mac/Attic/tclMacLoad.c,v
retrieving revision 1.16
diff -u -p -r1.16 tclMacLoad.c
--- mac/tclMacLoad.c	9 Oct 2002 11:54:26 -0000	1.16
+++ mac/tclMacLoad.c	2 May 2004 18:21:45 -0000
@@ -28,8 +28,8 @@
     #define fragNoErr noErr
 #endif
 
-#include "tclPort.h"
 #include "tclInt.h"
+#include "tclPort.h"
 #include "tclMacInt.h"
 
 #if GENERATINGPOWERPC
Index: mac/tclMacOSA.c
===================================================================
RCS file: /cvsroot/tcl/tcl/mac/Attic/tclMacOSA.c,v
retrieving revision 1.10
diff -u -p -r1.10 tclMacOSA.c
--- mac/tclMacOSA.c	9 Oct 2002 11:54:30 -0000	1.10
+++ mac/tclMacOSA.c	2 May 2004 18:21:58 -0000
@@ -36,7 +36,6 @@
 #include <MoreFiles.h>
 #include <FullPath.h>
 
-#include "tcl.h"
 #include "tclInt.h"
 
 /*
Index: mac/tclMacPort.h
===================================================================
RCS file: /cvsroot/tcl/tcl/mac/Attic/tclMacPort.h,v
retrieving revision 1.17
diff -u -p -r1.17 tclMacPort.h
--- mac/tclMacPort.h	3 Mar 2003 20:22:44 -0000	1.17
+++ mac/tclMacPort.h	2 May 2004 18:22:00 -0000
@@ -17,9 +17,7 @@
 #ifndef _MACPORT
 #define _MACPORT
 
-#ifndef _TCLINT
-#   include "tclInt.h"
-#endif
+#include "tclInt.h"
 
 /*
  *---------------------------------------------------------------------------
Index: mac/tclMacResource.c
===================================================================
RCS file: /cvsroot/tcl/tcl/mac/Attic/tclMacResource.c,v
retrieving revision 1.14.2.1
diff -u -p -r1.14.2.1 tclMacResource.c
--- mac/tclMacResource.c	1 Oct 2003 14:34:16 -0000	1.14.2.1
+++ mac/tclMacResource.c	2 May 2004 18:22:10 -0000
@@ -24,7 +24,6 @@
 #include <LowMem.h>
 
 #include "FullPath.h"
-#include "tcl.h"
 #include "tclInt.h"
 #include "tclMac.h"
 #include "tclMacInt.h"
Index: mac/tclMacUtil.c
===================================================================
RCS file: /cvsroot/tcl/tcl/mac/Attic/tclMacUtil.c,v
retrieving revision 1.7
diff -u -p -r1.7 tclMacUtil.c
--- mac/tclMacUtil.c	3 Mar 2003 20:22:44 -0000	1.7
+++ mac/tclMacUtil.c	2 May 2004 18:22:13 -0000
@@ -13,7 +13,6 @@
  * RCS: @(#) $Id: tclMacUtil.c,v 1.7 2003/03/03 20:22:44 das Exp $
  */
 
-#include "tcl.h"
 #include "tclInt.h"
 #include "tclMacInt.h"
 #include "tclMath.h"
Index: macosx/tclMacOSXBundle.c
===================================================================
RCS file: /cvsroot/tcl/tcl/macosx/tclMacOSXBundle.c,v
retrieving revision 1.3.2.2
diff -u -p -r1.3.2.2 tclMacOSXBundle.c
--- macosx/tclMacOSXBundle.c	22 May 2003 01:15:33 -0000	1.3.2.2
+++ macosx/tclMacOSXBundle.c	2 May 2004 18:22:16 -0000
@@ -51,8 +51,8 @@
  *      license.
  */
 
-#include <CoreFoundation/CoreFoundation.h>
 #include "tcl.h"
+#include <CoreFoundation/CoreFoundation.h>
 
 /*
  *----------------------------------------------------------------------
Index: unix/tclAppInit.c
===================================================================
RCS file: /cvsroot/tcl/tcl/unix/tclAppInit.c,v
retrieving revision 1.11
diff -u -p -r1.11 tclAppInit.c
--- unix/tclAppInit.c	31 May 2002 22:20:22 -0000	1.11
+++ unix/tclAppInit.c	2 May 2004 18:23:13 -0000
@@ -14,11 +14,9 @@
  * RCS: @(#) $Id: tclAppInit.c,v 1.11 2002/05/31 22:20:22 dgp Exp $
  */
 
-#include "tcl.h"
+#include "tclInt.h"
 
 #ifdef TCL_TEST
-
-#include "tclInt.h"
 
 extern int		Procbodytest_Init _ANSI_ARGS_((Tcl_Interp *interp));
 extern int		Procbodytest_SafeInit _ANSI_ARGS_((Tcl_Interp *interp));
Index: win/tclWinInt.h
===================================================================
RCS file: /cvsroot/tcl/tcl/win/tclWinInt.h,v
retrieving revision 1.20.2.2
diff -u -p -r1.20.2.2 tclWinInt.h
--- win/tclWinInt.h	21 Mar 2004 20:59:28 -0000	1.20.2.2
+++ win/tclWinInt.h	2 May 2004 18:23:37 -0000
@@ -14,12 +14,8 @@
 #ifndef _TCLWININT
 #define _TCLWININT
 
-#ifndef _TCLINT
 #include "tclInt.h"
-#endif
-#ifndef _TCLPORT
 #include "tclPort.h"
-#endif
 
 /*
  * The following specifies how much stack space TclpCheckStackSpace()
Index: win/tclWinPort.h
===================================================================
RCS file: /cvsroot/tcl/tcl/win/tclWinPort.h,v
retrieving revision 1.36
diff -u -p -r1.36 tclWinPort.h
--- win/tclWinPort.h	27 Nov 2002 18:13:38 -0000	1.36
+++ win/tclWinPort.h	2 May 2004 18:23:40 -0000
@@ -16,9 +16,7 @@
 #ifndef _TCLWINPORT
 #define _TCLWINPORT
 
-#ifndef _TCLINT
-#   include "tclInt.h"
-#endif
+#include "tclInt.h"
 
 #ifdef CHECK_UNICODE_CALLS
 #   define _UNICODE
