summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs>2002-02-02 00:16:05 (GMT)
committerhobbs <hobbs>2002-02-02 00:16:05 (GMT)
commit4ad7f3e495e1d3885d7661ae4cc2ec6cab981bf2 (patch)
treea4d9bce885f6ff7c1b8cce1995066a47ba446ece
parentd2d161ee40d48496fc6463e64f3ee390ea037dd5 (diff)
downloadtk-4ad7f3e495e1d3885d7661ae4cc2ec6cab981bf2.zip
tk-4ad7f3e495e1d3885d7661ae4cc2ec6cab981bf2.tar.gz
tk-4ad7f3e495e1d3885d7661ae4cc2ec6cab981bf2.tar.bz2
* generic/tkCmds.c (Tk_TkObjCmd): don't use 'bool' as an arg as it
conflicts with the C99 spec. [Bug #511956] (ingham)
-rw-r--r--ChangeLog5
-rw-r--r--generic/tkCmds.c8
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index f6b2858..0a83131 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-02-01 Jeff Hobbs <jeffh@ActiveState.com>
+
+ * generic/tkCmds.c (Tk_TkObjCmd): don't use 'bool' as an arg as it
+ conflicts with the C99 spec. [Bug #511956] (ingham)
+
2002-02-01 David Gravereaux <davygrvy@pobox.com>
* win/makefile.vc: unset macro located in the tktest target
diff --git a/generic/tkCmds.c b/generic/tkCmds.c
index 572868c..c589f8f 100644
--- a/generic/tkCmds.c
+++ b/generic/tkCmds.c
@@ -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: tkCmds.c,v 1.21 2002/01/17 05:13:11 dgp Exp $
+ * RCS: @(#) $Id: tkCmds.c,v 1.22 2002/02/02 00:16:05 hobbs Exp $
*/
#include "tkPort.h"
@@ -708,13 +708,13 @@ Tk_TkObjCmd(clientData, interp, objc, objv)
* That will indicate to the user that input methods
* are just not available.
*/
- int bool;
- if (Tcl_GetBooleanFromObj(interp, objv[2+skip], &bool)
+ int boolVal;
+ if (Tcl_GetBooleanFromObj(interp, objv[2+skip], &boolVal)
!= TCL_OK) {
return TCL_ERROR;
}
#ifdef TK_USE_INPUT_METHODS
- dispPtr->useInputMethods = bool;
+ dispPtr->useInputMethods = boolVal;
#endif /* TK_USE_INPUT_METHODS */
} else if ((objc - skip) != 2) {
Tcl_WrongNumArgs(interp, 2, objv,