summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs>1999-08-01 21:25:18 (GMT)
committerhobbs <hobbs>1999-08-01 21:25:18 (GMT)
commit789884c7c8b72c37398850a790444a65e480b19b (patch)
tree597bdf8ee227bfdb579f4842630fbca4e3ddcced
parent955bd4ef79ee349f0c4ea3618bb214301f875de6 (diff)
downloadtk-789884c7c8b72c37398850a790444a65e480b19b.zip
tk-789884c7c8b72c37398850a790444a65e480b19b.tar.gz
tk-789884c7c8b72c37398850a790444a65e480b19b.tar.bz2
1999-08-01 Jeff Hobbs <hobbs@scriptics.com>
* mac/tkMacPort.h: wrapped panic in #ifndef panic to avoid compiler errors when used with stubs-#defines, from Vince Darley. [Bug: 2389]
-rw-r--r--ChangeLog8
-rw-r--r--mac/tkMacPort.h4
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 <hobbs@scriptics.com>
+
+ * 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 <redman@scriptics.com>
* xlib/X11/Xlib.h: Remove XFillRectangle since it is now in the
@@ -5,7 +11,7 @@
1999-07-30 Jeff Hobbs <hobbs@scriptics.com>
- * tkInt.decls: Added stub entry for XFillRectangle [Bug: 2446]
+ * generic/tkInt.decls: Added stub entry for XFillRectangle [Bug: 2446]
1999-07-30 <redman@scriptics.com>
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,