diff options
| author | dgp <dgp@users.sourceforge.net> | 2006-03-13 18:18:53 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2006-03-13 18:18:53 (GMT) |
| commit | e7a28cd82e797c533d8b3b3856ce317762ca165a (patch) | |
| tree | e7646be175d93c201012c416eba7ac38b3a10a79 /macosx | |
| parent | 92f42c4710b59e4b7d590bcac400948f88778128 (diff) | |
| download | tk-e7a28cd82e797c533d8b3b3856ce317762ca165a.zip tk-e7a28cd82e797c533d8b3b3856ce317762ca165a.tar.gz tk-e7a28cd82e797c533d8b3b3856ce317762ca165a.tar.bz2 | |
* 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]
Diffstat (limited to 'macosx')
| -rw-r--r-- | macosx/tkMacOSXPort.h | 27 | ||||
| -rw-r--r-- | macosx/tkMacOSXWm.c | 3 | ||||
| -rw-r--r-- | macosx/tkMacOSXWm.h | 3 |
3 files changed, 6 insertions, 27 deletions
diff --git a/macosx/tkMacOSXPort.h b/macosx/tkMacOSXPort.h index 81f190b..61e2795 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.3.2.4 2006/02/09 19:09:43 das Exp $ + * RCS: @(#) $Id: tkMacOSXPort.h,v 1.3.2.5 2006/03/13 18:19:00 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 977a0e5..ba5abec 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.7.2.16 2006/02/09 19:09:43 das Exp $ + * RCS: @(#) $Id: tkMacOSXWm.c,v 1.7.2.17 2006/03/13 18:19:00 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 5c33a5d..3753098 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.2.2.2 2005/08/09 07:40:02 das Exp $ + * RCS: @(#) $Id: tkMacOSXWm.h,v 1.2.2.3 2006/03/13 18:19:01 dgp Exp $ */ #ifndef _TKMACWM @@ -60,7 +60,6 @@ #include "tkPort.h" #include "tkInt.h" #include "tkMacOSXInt.h" -#include <errno.h> #include "tkScrollbar.h" /* |