From cd201a745af23cce1d4e8c78aaed0a39b5760788 Mon Sep 17 00:00:00 2001 From: patthoyts Date: Sat, 26 Jul 2008 11:49:27 +0000 Subject: bug #2026405: Check for 0x prefix in sprintf %p to work around cygwin issue. --- ChangeLog | 4 ++++ win/tkWinWindow.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index eb55729..c5a2ce5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2008-07-26 Pat Thoyts + + * win/tkWinWindow.c: Check for 0x prefix in sprintf %p. Bug [2026405] + 2008-07-22 Daniel Steffen * library/ttk/aquaTheme.tcl: Use system color names and TIP145 named diff --git a/win/tkWinWindow.c b/win/tkWinWindow.c index e7a25af..6959781 100644 --- a/win/tkWinWindow.c +++ b/win/tkWinWindow.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWinWindow.c,v 1.15 2007/02/23 14:15:34 dkf Exp $ + * RCS: @(#) $Id: tkWinWindow.c,v 1.15.4.1 2008/07/26 11:49:30 patthoyts Exp $ */ #include "tkWinInt.h" @@ -174,9 +174,12 @@ TkpPrintWindowId( /* * Use pointer representation, because Win64 is P64 (*not* LP64). Windows * doesn't print the 0x for %p, so we do it. + * bug #2026405: cygwin does output 0x for %p so test and recover. */ sprintf(buf, "0x%p", hwnd); + if (buf[2] == '0' && buf[3] == 'x') + sprintf(buf, "%p", hwnd); } /* -- cgit v0.12