diff options
| author | Keith Packard <keithp@keithp.com> | 2014-10-27 15:39:26 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-10-27 15:39:26 -0700 |
| commit | 3a123fbdda56b24dc01a2308137144dc960e0d61 (patch) | |
| tree | 19ecde5269c6adf8d8bfe6f76d7e459349de07df /hw/xwin/winwndproc.c | |
| parent | 9b29fa957a397664463c7c78fbcc2f34d1993271 (diff) | |
| parent | 7ea4a21feed5ac5e71cc6d8141c97d6362402c5d (diff) | |
Merge remote-tracking branch 'jturney/master'
Conflicts:
hw/xwin/winpixmap.c
Adam removed a pile of windows code, including this file.
Diffstat (limited to 'hw/xwin/winwndproc.c')
| -rw-r--r-- | hw/xwin/winwndproc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/xwin/winwndproc.c b/hw/xwin/winwndproc.c index 1b0992186..76e487c0c 100644 --- a/hw/xwin/winwndproc.c +++ b/hw/xwin/winwndproc.c @@ -621,7 +621,7 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) int iBorderHeight, iBorderWidth; #if CYGDEBUG - winDebug("winWindowProc - WM_GETMINMAXINFO - pScreenInfo: %08x\n", + winDebug("winWindowProc - WM_GETMINMAXINFO - pScreenInfo: %p\n", s_pScreenInfo); #endif |