diff options
| author | marha <marha@users.sourceforge.net> | 2010-10-19 21:03:53 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-10-19 21:03:53 +0000 |
| commit | be10ad8a9efe4131c14c2dde36adaf11e7b125aa (patch) | |
| tree | 0a0f9305b181d427c5581f7a072e69e52199bdbb /xorg-server/hw/xwin/winclipboardxevents.c | |
| parent | 2197318e5fc026ee57325ce953113d1963e7dc82 (diff) | |
| parent | 6ab3babba7b1b74528c2194a495fa1e2e67faa55 (diff) | |
| download | vcxsrv-be10ad8a9efe4131c14c2dde36adaf11e7b125aa.tar.gz vcxsrv-be10ad8a9efe4131c14c2dde36adaf11e7b125aa.tar.bz2 vcxsrv-be10ad8a9efe4131c14c2dde36adaf11e7b125aa.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xwin/winclipboardxevents.c')
| -rw-r--r-- | xorg-server/hw/xwin/winclipboardxevents.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xorg-server/hw/xwin/winclipboardxevents.c b/xorg-server/hw/xwin/winclipboardxevents.c index a3d333d80..c21e7e1b5 100644 --- a/xorg-server/hw/xwin/winclipboardxevents.c +++ b/xorg-server/hw/xwin/winclipboardxevents.c @@ -78,7 +78,7 @@ winClipboardFlushXEvents (HWND hwnd, XEvent event;
XSelectionEvent eventSelection;
unsigned long ulReturnBytesLeft;
- unsigned char *pszReturnData = NULL;
+ char *pszReturnData = NULL;
char *pszGlobalData = NULL;
int iReturn;
HGLOBAL hGlobal = NULL;
@@ -225,7 +225,7 @@ winClipboardFlushXEvents (HWND hwnd, if (!OpenClipboard (hwnd))
{
ErrorF ("winClipboardFlushXEvents - SelectionRequest - "
- "OpenClipboard () failed: %08x\n",
+ "OpenClipboard () failed: %08lx\n",
GetLastError ());
/* Abort */
@@ -275,7 +275,7 @@ winClipboardFlushXEvents (HWND hwnd, XSetSelectionOwner (pDisplay, XInternAtom (pDisplay, "CLIPBOARD", False), None, CurrentTime);
}
ErrorF ("winClipboardFlushXEvents - SelectionRequest - "
- "GetClipboardData () failed: %08x\n",
+ "GetClipboardData () failed: %08lx\n",
GetLastError ());
/* Abort */
|