summaryrefslogtreecommitdiffstats
path: root/generic/tkStubLib.c
diff options
context:
space:
mode:
authordas <das>2001-11-23 02:04:08 (GMT)
committerdas <das>2001-11-23 02:04:08 (GMT)
commitaa409cc42da819e8ab1d081e7a1f175b33c1c2cf (patch)
tree0d0864ac4fc0b0ff178f5869f1600d2c584109c8 /generic/tkStubLib.c
parent5efa25f6e1ad2a687cac8c1caab6d8c10f978269 (diff)
downloadtk-aa409cc42da819e8ab1d081e7a1f175b33c1c2cf.zip
tk-aa409cc42da819e8ab1d081e7a1f175b33c1c2cf.tar.gz
tk-aa409cc42da819e8ab1d081e7a1f175b33c1c2cf.tar.bz2
** upport to 8.4 of mac code changes for 8.3.3 & various new
** changes for 8.4, some already backported to 8.3.4 (patch #435660) see ChangeLog for details
Diffstat (limited to 'generic/tkStubLib.c')
-rw-r--r--generic/tkStubLib.c18
1 files changed, 4 insertions, 14 deletions
diff --git a/generic/tkStubLib.c b/generic/tkStubLib.c
index 1783e32..d8e3f05 100644
--- a/generic/tkStubLib.c
+++ b/generic/tkStubLib.c
@@ -10,19 +10,9 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkStubLib.c,v 1.6 2001/05/22 00:22:41 hobbs Exp $
+ * RCS: @(#) $Id: tkStubLib.c,v 1.7 2001/11/23 02:07:11 das Exp $
*/
-/*
- * Because of problems with pre-compiled headers on the Mac, we need to
- * do these includes before we add the stubs defines. This a hack.
- */
-
-#ifdef MAC_TCL
-#include "tkMacInt.h"
-#include "tkInt.h"
-#include "tkPort.h"
-#endif /* MAC_TCL */
/*
* We need to ensure that we use the stub macros so that this file contains
@@ -41,8 +31,6 @@
#endif
#undef USE_TK_STUB_PROCS
-#ifndef MAC_TCL
-
#include "tkPort.h"
#include "tkInt.h"
@@ -50,7 +38,9 @@
#include "tkWinInt.h"
#endif
-#endif /* !MAC_TCL */
+#ifdef MAC_TCL
+#include "tkMacInt.h"
+#endif
#include "tkDecls.h"
#include "tkIntDecls.h"