diff options
Diffstat (limited to 'tk/mac/tkMacPort.h')
| -rw-r--r-- | tk/mac/tkMacPort.h | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/tk/mac/tkMacPort.h b/tk/mac/tkMacPort.h index b1895b236f4..739d311ec44 100644 --- a/tk/mac/tkMacPort.h +++ b/tk/mac/tkMacPort.h @@ -6,7 +6,6 @@ * #includes for system include files and a few other things. * * Copyright (c) 1994-1996 Sun Microsystems, Inc. - * Copyright (c) 1998 by Scriptics Corporation. * * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. @@ -49,6 +48,7 @@ #include <Xatom.h> #include <Xfuncproto.h> #include <Xutil.h> +#include "tkIntXlibDecls.h" /* * Not all systems declare the errno variable in errno.h. so this @@ -70,12 +70,17 @@ extern int errno; * in any other header file. */ +#ifndef panic /* In a stubs-aware setting, this could confuse the #define */ extern void panic _ANSI_ARGS_(TCL_VARARGS(char *, string)); +#endif +#ifndef strcasecmp extern int strcasecmp _ANSI_ARGS_((CONST char *s1, CONST char *s2)); +#endif +#ifndef strncasecmp extern int strncasecmp _ANSI_ARGS_((CONST char *s1, CONST char *s2, size_t n)); - +#endif /* * Defines for X functions that are used by Tk but are treated as * no-op functions on the Macintosh. @@ -91,15 +96,15 @@ extern int strncasecmp _ANSI_ARGS_((CONST char *s1, #define XVisualIDFromVisual(visual) (visual->visualid) /* - * The following functions are not used on the Mac, so we stub it out. + * The following functions are not used on the Mac, so we stub them out. */ #define TkFreeWindowId(dispPtr,w) #define TkInitXId(dispPtr) +#define TkpButtonSetDefaults(specPtr) {} #define TkpCmapStressed(tkwin,colormap) (0) #define TkpFreeColor(tkColPtr) #define TkSetPixmapColormap(p,c) {} -#define Tk_FreeXId(display,xid) #define TkpSync(display) /* @@ -145,3 +150,5 @@ extern int strncasecmp _ANSI_ARGS_((CONST char *s1, #define APPEARANCE_PIXEL 52 #endif /* _TKMACPORT */ + + |