From 789884c7c8b72c37398850a790444a65e480b19b Mon Sep 17 00:00:00 2001 From: hobbs Date: Sun, 1 Aug 1999 21:25:18 +0000 Subject: 1999-08-01 Jeff Hobbs * mac/tkMacPort.h: wrapped panic in #ifndef panic to avoid compiler errors when used with stubs-#defines, from Vince Darley. [Bug: 2389] --- ChangeLog | 8 +++++++- mac/tkMacPort.h | 4 +++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index be9ca85..3b053df 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +1999-08-01 Jeff Hobbs + + * mac/tkMacPort.h: wrapped panic in #ifndef panic to avoid + compiler errors when used with stubs-#defines, from Vince Darley. + [Bug: 2389] + 1999-07-31 Scott Redman * xlib/X11/Xlib.h: Remove XFillRectangle since it is now in the @@ -5,7 +11,7 @@ 1999-07-30 Jeff Hobbs - * tkInt.decls: Added stub entry for XFillRectangle [Bug: 2446] + * generic/tkInt.decls: Added stub entry for XFillRectangle [Bug: 2446] 1999-07-30 diff --git a/mac/tkMacPort.h b/mac/tkMacPort.h index 034f0ec..9dc2d31 100644 --- a/mac/tkMacPort.h +++ b/mac/tkMacPort.h @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacPort.h,v 1.7 1999/05/22 06:34:57 jingham Exp $ + * RCS: @(#) $Id: tkMacPort.h,v 1.8 1999/08/01 21:25:23 hobbs Exp $ */ #ifndef _TKMACPORT @@ -70,7 +70,9 @@ 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 extern int strcasecmp _ANSI_ARGS_((CONST char *s1, CONST char *s2)); extern int strncasecmp _ANSI_ARGS_((CONST char *s1, -- cgit v0.12