* generic/tkCmds.c: Purged remaining references to

        * macosx/tkMacOSXPort.h:        errno, and errno.h.  Standardized
        * macosx/tkMacOSXWm.c:          the logic for using header files from
        * macosx/tkMacOSXWm.h:          the compat directory.  Thanks Joe
        * unix/tkUnixPort.h:            English for the patch. [Patch 1445404]

6 files changed, 18 insertions, 39 deletions

diff --git a/ChangeLog b/ChangeLog
index f92bb8f..4953c1f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+006-03-13  Don Porter  <dgp@users.sourceforge.net>
+
+        * generic/tkCmds.c:             Purged remaining references to
+        * macosx/tkMacOSXPort.h:        errno, and errno.h.  Standardized
+        * macosx/tkMacOSXWm.c:          the logic for using header files from
+        * macosx/tkMacOSXWm.h:          the compat directory.  Thanks Joe
+        * unix/tkUnixPort.h:            English for the patch. [Patch 1445404]
+
 2006-03-08  Don Porter	<dgp@users.sourceforge.net>
 
 	* unix/Makefile.in:	Update `make dist` to copy the image files
diff --git a/generic/tkCmds.c b/generic/tkCmds.c
index b993dca..16df75d 100644
--- a/generic/tkCmds.c
+++ b/generic/tkCmds.c
@@ -11,12 +11,11 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkCmds.c,v 1.37 2005/11/11 23:51:27 dkf Exp $
+ * RCS: @(#) $Id: tkCmds.c,v 1.38 2006/03/13 18:19:18 dgp Exp $
  */
 
 #include "tkPort.h"
 #include "tkInt.h"
-#include <errno.h>
 
 #if defined(WIN32)
 #include "tkWinInt.h"
diff --git a/macosx/tkMacOSXPort.h b/macosx/tkMacOSXPort.h
index c43fcce..cfabc15 100644
--- a/macosx/tkMacOSXPort.h
+++ b/macosx/tkMacOSXPort.h
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkMacOSXPort.h,v 1.7 2006/02/09 19:08:51 das Exp $
+ * RCS: @(#) $Id: tkMacOSXPort.h,v 1.8 2006/03/13 18:19:18 dgp Exp $
  */
 
 #ifndef _TKMACPORT
@@ -35,18 +35,10 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <fcntl.h>
-#ifdef HAVE_LIMITS_H
-#   include <limits.h>
-#else
-#   include "../compat/limits.h"
-#endif
+#include <limits.h>
 #include <math.h>
 #include <pwd.h>
-#ifdef NO_STDLIB_H
-#   include "../compat/stdlib.h"
-#else
-#   include <stdlib.h>
-#endif
+#include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/file.h>
@@ -67,11 +59,7 @@
 #       include <time.h>
 #   endif
 #endif
-#ifdef HAVE_UNISTD_H
-#   include <unistd.h>
-#else
-#   include "../compat/unistd.h"
-#endif
+#include <unistd.h>
 #include <X11/Xlib.h>
 #include <X11/cursorfont.h>
 #include <X11/keysym.h>
@@ -118,13 +106,6 @@
 #define MASK_SIZE howmany(FD_SETSIZE, NFDBITS)
 
 /*
- * Not all systems declare the errno variable in errno.h. so this
- * file does it explicitly.
- */
-
-extern int errno;
-
-/*
  * Define "NBBY" (number of bits per byte) if it's not already defined.
  */
 
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index 3cc0444..10d1288 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -12,14 +12,13 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkMacOSXWm.c,v 1.22 2006/02/09 19:08:50 das Exp $
+ * RCS: @(#) $Id: tkMacOSXWm.c,v 1.23 2006/03/13 18:19:18 dgp Exp $
  */
 #include <Carbon/Carbon.h>
 
 #include "tkPort.h"
 #include "tkInt.h"
 #include "tkMacOSXInt.h"
-#include <errno.h>
 #include "tkScrollbar.h"
 #include "tkMacOSXWm.h"
 #include "tkMacOSXEvent.h"
diff --git a/macosx/tkMacOSXWm.h b/macosx/tkMacOSXWm.h
index 3284c6d..a66e3d2 100644
--- a/macosx/tkMacOSXWm.h
+++ b/macosx/tkMacOSXWm.h
@@ -50,7 +50,7 @@
  *      software in accordance with the terms specified in this
  *      license.
  *
- * RCS: @(#) $Id: tkMacOSXWm.h,v 1.4 2005/08/09 07:39:22 das Exp $
+ * RCS: @(#) $Id: tkMacOSXWm.h,v 1.5 2006/03/13 18:19:18 dgp Exp $
  */
  
 #ifndef _TKMACWM
@@ -60,7 +60,6 @@
 #include "tkPort.h"
 #include "tkInt.h"
 #include "tkMacOSXInt.h"
-#include <errno.h>
 #include "tkScrollbar.h"
 
 /*
diff --git a/unix/tkUnixPort.h b/unix/tkUnixPort.h
index bdb6340..7092840 100644
--- a/unix/tkUnixPort.h
+++ b/unix/tkUnixPort.h
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkUnixPort.h,v 1.10 2005/09/28 18:31:57 dgp Exp $
+ * RCS: @(#) $Id: tkUnixPort.h,v 1.11 2006/03/13 18:19:19 dgp Exp $
  */
 
 #ifndef _UNIXPORT
@@ -37,7 +37,7 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <fcntl.h>
-#ifdef HAVE_LIMITS_H
+#ifndef NO_LIMITS_H
 #   include <limits.h>
 #else
 #   include "../compat/limits.h"
@@ -69,7 +69,7 @@
 #       include <time.h>
 #   endif
 #endif
-#ifdef HAVE_UNISTD_H
+#ifndef NO_UNISTD_H
 #   include <unistd.h>
 #else
 #   include "../compat/unistd.h"
@@ -120,13 +120,6 @@
 #define MASK_SIZE howmany(FD_SETSIZE, NFDBITS)
 
 /*
- * Not all systems declare the errno variable in errno.h. so this
- * file does it explicitly.
- */
-
-extern int errno;
-
-/*
  * Define "NBBY" (number of bits per byte) if it's not already defined.
  */