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/include | |
| 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/include')
| -rw-r--r-- | xorg-server/include/input.h | 1 | ||||
| -rw-r--r-- | xorg-server/include/os.h | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/xorg-server/include/input.h b/xorg-server/include/input.h index 5747f3cd2..f8459b8c8 100644 --- a/xorg-server/include/input.h +++ b/xorg-server/include/input.h @@ -579,6 +579,7 @@ extern int TouchListenerAcceptReject(DeviceIntPtr dev, TouchPointInfoPtr ti, int listener, int mode); extern int TouchAcceptReject(ClientPtr client, DeviceIntPtr dev, int mode, uint32_t touchid, Window grab_window, XID *error); +extern void TouchEndPhysicallyActiveTouches(DeviceIntPtr dev); /* misc event helpers */ extern Mask GetEventMask(DeviceIntPtr dev, xEvent *ev, InputClientsPtr clients); diff --git a/xorg-server/include/os.h b/xorg-server/include/os.h index d906834f1..68f405714 100644 --- a/xorg-server/include/os.h +++ b/xorg-server/include/os.h @@ -88,7 +88,9 @@ extern void ddxBeforeReset(void); #endif #ifdef DDXOSVERRORF -extern _X_EXPORT void (*OsVendorVErrorFProc) (const char *, va_list args); +extern _X_EXPORT void (*OsVendorVErrorFProc) (const char *, + va_list args) +_X_ATTRIBUTE_PRINTF(1, 0); #endif extern _X_EXPORT int WaitForSomething(int * /*pClientsReady */ |