summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorpatthoyts <patthoyts@users.sourceforge.net>2008-07-26 11:17:23 (GMT)
committerpatthoyts <patthoyts@users.sourceforge.net>2008-07-26 11:17:23 (GMT)
commitc3574e6a659de1cae335c79d81865b60f67aea49 (patch)
tree5a7a6e841bda9c6edc8403701a5462ca2de81e67 /win
parent70c62b8297815045091246addadfd5f57d3458ee (diff)
downloadtk-c3574e6a659de1cae335c79d81865b60f67aea49.zip
tk-c3574e6a659de1cae335c79d81865b60f67aea49.tar.gz
tk-c3574e6a659de1cae335c79d81865b60f67aea49.tar.bz2
bug #2026405: Check for 0x prefix in sprintf %p and redo if necessary. Works around cygwin issue.
Diffstat (limited to 'win')
-rw-r--r--win/tkWinWindow.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/win/tkWinWindow.c b/win/tkWinWindow.c
index 1c2745c..95e7a16 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.16 2008/04/27 22:39:17 dkf Exp $
+ * RCS: @(#) $Id: tkWinWindow.c,v 1.17 2008/07/26 11:17:25 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);
}
/*