diff options
| author | welch <welch> | 1998-08-04 23:24:41 (GMT) |
|---|---|---|
| committer | welch <welch> | 1998-08-04 23:24:41 (GMT) |
| commit | 7c517bcb8d334b9b903b554897ac36d12deaf9d0 (patch) | |
| tree | e13c23e156bcfba7d6d1d8277b9bee6e57380313 /generic/tkCmds.c | |
| parent | 153bc0e1be37b10f067b8263562d4d50fbc4bac8 (diff) | |
| download | tk-7c517bcb8d334b9b903b554897ac36d12deaf9d0.zip tk-7c517bcb8d334b9b903b554897ac36d12deaf9d0.tar.gz tk-7c517bcb8d334b9b903b554897ac36d12deaf9d0.tar.bz2 | |
Changed main to mainwin to avoid compiler warnings
Diffstat (limited to 'generic/tkCmds.c')
| -rw-r--r-- | generic/tkCmds.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/generic/tkCmds.c b/generic/tkCmds.c index 34e2867..e705109 100644 --- a/generic/tkCmds.c +++ b/generic/tkCmds.c @@ -452,7 +452,7 @@ Tk_LowerCmd(clientData, interp, argc, argv) int argc; /* Number of arguments. */ char **argv; /* Argument strings. */ { - Tk_Window main = (Tk_Window) clientData; + Tk_Window mainwin = (Tk_Window) clientData; Tk_Window tkwin, other; if ((argc != 2) && (argc != 3)) { @@ -461,14 +461,14 @@ Tk_LowerCmd(clientData, interp, argc, argv) return TCL_ERROR; } - tkwin = Tk_NameToWindow(interp, argv[1], main); + tkwin = Tk_NameToWindow(interp, argv[1], mainwin); if (tkwin == NULL) { return TCL_ERROR; } if (argc == 2) { other = NULL; } else { - other = Tk_NameToWindow(interp, argv[2], main); + other = Tk_NameToWindow(interp, argv[2], mainwin); if (other == NULL) { return TCL_ERROR; } @@ -507,7 +507,7 @@ Tk_RaiseCmd(clientData, interp, argc, argv) int argc; /* Number of arguments. */ char **argv; /* Argument strings. */ { - Tk_Window main = (Tk_Window) clientData; + Tk_Window mainwin = (Tk_Window) clientData; Tk_Window tkwin, other; if ((argc != 2) && (argc != 3)) { @@ -516,14 +516,14 @@ Tk_RaiseCmd(clientData, interp, argc, argv) return TCL_ERROR; } - tkwin = Tk_NameToWindow(interp, argv[1], main); + tkwin = Tk_NameToWindow(interp, argv[1], mainwin); if (tkwin == NULL) { return TCL_ERROR; } if (argc == 2) { other = NULL; } else { - other = Tk_NameToWindow(interp, argv[2], main); + other = Tk_NameToWindow(interp, argv[2], mainwin); if (other == NULL) { return TCL_ERROR; } |