From bf5820e2248feadca3d6a163aa562453a38791d2 Mon Sep 17 00:00:00 2001
From: das <das>
Date: Thu, 24 Feb 2005 00:41:02 +0000
Subject: 	* macosx/tkMacOSX.h: fixed incorrect inclusion of internal
 header. 	* macosx/tkMacOSXNotify.c: corrected included headers.

---
 ChangeLog               |  5 +++++
 macosx/tkMacOSX.h       |  8 +++++---
 macosx/tkMacOSXNotify.c | 10 +++-------
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1714cd2..9b77dc1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-24  Daniel Steffen  <das@users.sourceforge.net>
+
+	* macosx/tkMacOSX.h: fixed incorrect inclusion of internal header.
+	* macosx/tkMacOSXNotify.c: corrected included headers.
+
 2005-02-22  Daniel Steffen  <das@users.sourceforge.net>
 
 	* macosx/tkMacOSXDialog.c (Tk_GetSaveFileObjCmd, NavServicesGetFile):
diff --git a/macosx/tkMacOSX.h b/macosx/tkMacOSX.h
index 45bbf7b..89e6641 100644
--- a/macosx/tkMacOSX.h
+++ b/macosx/tkMacOSX.h
@@ -1,5 +1,5 @@
 /*
- * tkMacOSXInt.h --
+ * tkMacOSX.h --
  *
  *	Declarations of Macintosh specific exported variables and procedures.
  *
@@ -9,14 +9,16 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkMacOSX.h,v 1.2 2002/08/31 06:12:29 das Exp $
+ * RCS: @(#) $Id: tkMacOSX.h,v 1.3 2005/02/24 00:41:04 das Exp $
  */
 
 #ifndef _TKMAC
 #define _TKMAC
 
 #include <Carbon/Carbon.h>
-#include "tkInt.h"
+#ifndef _TK
+#include "tk.h"
+#endif
 
 /*
  * Structures and function types for handling Netscape-type in process
diff --git a/macosx/tkMacOSXNotify.c b/macosx/tkMacOSXNotify.c
index 7ab74e0..d2991a7 100644
--- a/macosx/tkMacOSXNotify.c
+++ b/macosx/tkMacOSXNotify.c
@@ -1,5 +1,5 @@
 /*
- * tclMacOSXNotify.c --
+ * tkMacOSXNotify.c --
  *
  *	This file contains the implementation of a merged 
  *	Carbon/select-based notifier, which is the lowest-level part 
@@ -12,15 +12,11 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkMacOSXNotify.c,v 1.7 2004/02/16 00:19:42 wolfsuit Exp $
+ * RCS: @(#) $Id: tkMacOSXNotify.c,v 1.8 2005/02/24 00:41:04 das Exp $
  */
 
 #include "tclInt.h"
-
-/* FIXME - Why do I need these here? */
-
-#undef environ
-#include "tkMacOSX.h"
+#include "tkInt.h"
 #include "tkMacOSXEvent.h"
 
 #include <signal.h> 
-- 
cgit v0.12