diff options
| author | dgp <dgp@users.sourceforge.net> | 2012-09-13 12:28:42 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2012-09-13 12:28:42 (GMT) |
| commit | 3d4b27d90c3c257b645097a58df4b34ae16e5474 (patch) | |
| tree | a471fc6dcd2488604d564c62dca89663f7a63c37 | |
| parent | 55c86e8fadf1375127079e6d0eae0699ab154dfe (diff) | |
| parent | 5e1957ead7ef340445e8114e3caa90f98d40857d (diff) | |
| download | tk-3d4b27d90c3c257b645097a58df4b34ae16e5474.zip tk-3d4b27d90c3c257b645097a58df4b34ae16e5474.tar.gz tk-3d4b27d90c3c257b645097a58df4b34ae16e5474.tar.bz2 | |
merge trunk
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | unix/tcl.m4 | 4 | ||||
| -rw-r--r-- | win/tkWinWm.c | 2 |
3 files changed, 7 insertions, 3 deletions
@@ -1,3 +1,7 @@ +2012-09-13 Donal K. Fellows <dkf@users.sf.net> + + * win/tkWinWm.c (WmTransientCmd): [Bug 3567283]: Added missing cast. + 2012-09-11 Donal K. Fellows <dkf@users.sf.net> * generic/ttk/ttkEntry.c (EntryDisplay): [Bug 3566594]: Must manually diff --git a/unix/tcl.m4 b/unix/tcl.m4 index a142baf..b13fddd 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -1968,7 +1968,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ AS_IF([test "$GCC" = yes],[use_sunmath=no],[ arch=`isainfo` AC_MSG_CHECKING([whether to use -lsunmath for fp rounding control]) - AS_IF([test "$arch" = "amd64 i386"], [ + AS_IF([test "$arch" = "amd64 i386" -o "$arch" = "i386"], [ AC_MSG_RESULT([yes]) MATH_LIBS="-lsunmath $MATH_LIBS" AC_CHECK_HEADER(sunmath.h) @@ -2001,7 +2001,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ ], [ AS_IF([test "$use_sunmath" = yes], [textmode=textoff],[textmode=text]) case $system in - SunOS-5.[[1-9]][[0-9]]*) + SunOS-5.[[1-9]][[0-9]]*|SunOS-5.[[7-9]]) SHLIB_LD="\${CC} -G -z $textmode \${LDFLAGS}";; *) SHLIB_LD="/usr/ccs/bin/ld -G -z $textmode";; diff --git a/win/tkWinWm.c b/win/tkWinWm.c index efed842..e353813 100644 --- a/win/tkWinWm.c +++ b/win/tkWinWm.c @@ -5526,7 +5526,7 @@ WmTransientCmd( } if (objc == 3) { if (masterPtr != NULL) { - Tcl_SetObjResult(interp, TkNewWindowObj(masterPtr)); + Tcl_SetObjResult(interp, TkNewWindowObj((Tk_Window) masterPtr)); } return TCL_OK; } |