diff options
| author | marha <marha@users.sourceforge.net> | 2012-10-30 10:18:15 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-10-30 10:18:15 +0100 |
| commit | 33d29586bf3a280e821e0bf62694492dba459dab (patch) | |
| tree | e029e900674f4f8901cae65c95acd3e15ce3948c /xorg-server/hw/xwin/winclipboardwrappers.c | |
| parent | af2d8fb974d476eadcd3cde3baebd038f5750600 (diff) | |
| parent | 7b3f315a5d8b90dcb0db5512ed91fa700027cb7a (diff) | |
| download | vcxsrv-33d29586bf3a280e821e0bf62694492dba459dab.tar.gz vcxsrv-33d29586bf3a280e821e0bf62694492dba459dab.tar.bz2 vcxsrv-33d29586bf3a280e821e0bf62694492dba459dab.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig xserver mesa git update 30 oct 2012
Conflicts:
xorg-server/dix/grabs.c
xorg-server/hw/xwin/winclipboard.h
xorg-server/hw/xwin/winclipboardthread.c
xorg-server/hw/xwin/winclipboardwrappers.c
xorg-server/hw/xwin/winmonitors.c
xorg-server/hw/xwin/winmsg.c
xorg-server/hw/xwin/winmsg.h
xorg-server/hw/xwin/winprefslex.l
xorg-server/hw/xwin/winprefsyacc.y
xorg-server/hw/xwin/winregistry.c
Diffstat (limited to 'xorg-server/hw/xwin/winclipboardwrappers.c')
| -rw-r--r-- | xorg-server/hw/xwin/winclipboardwrappers.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/xorg-server/hw/xwin/winclipboardwrappers.c b/xorg-server/hw/xwin/winclipboardwrappers.c index 247c8ea43..09fbfd3aa 100644 --- a/xorg-server/hw/xwin/winclipboardwrappers.c +++ b/xorg-server/hw/xwin/winclipboardwrappers.c @@ -49,9 +49,6 @@ * Local function prototypes */ -int winProcEstablishConnection(ClientPtr /* client */ ); -int winProcSetSelectionOwner(ClientPtr /* client */ ); - DISPATCH_PROC(winProcEstablishConnection); DISPATCH_PROC(winProcSetSelectionOwner); @@ -59,10 +56,8 @@ DISPATCH_PROC(winProcSetSelectionOwner); * References to external symbols */ -extern int g_iNumScreens; extern unsigned int g_uiAuthDataLen; extern char *g_pAuthData; -extern Bool g_fXdmcpEnabled; extern Bool g_fClipboardLaunched; extern Bool g_fClipboardStarted; extern Bool g_fClipboard; @@ -71,8 +66,6 @@ extern Atom g_atomLastOwnedSelection; extern HWND g_hwndClipboard; extern Bool g_fClipboardPrimary; -extern winDispatchProcPtr winProcEstablishConnectionOrig; -extern winDispatchProcPtr winProcSetSelectionOwnerOrig; /* * Wrapper for internal EstablishConnection function. |