diff options
| author | marha <marha@users.sourceforge.net> | 2012-10-30 08:08:23 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-10-30 08:08:23 +0100 |
| commit | 7b3f315a5d8b90dcb0db5512ed91fa700027cb7a (patch) | |
| tree | 5d8a2f4983d9814c71325059d75e6de2af1a3b3e /xorg-server/include | |
| parent | 8d86f8c566c4181c846a872a5a2f88718e635a72 (diff) | |
| download | vcxsrv-7b3f315a5d8b90dcb0db5512ed91fa700027cb7a.tar.gz vcxsrv-7b3f315a5d8b90dcb0db5512ed91fa700027cb7a.tar.bz2 vcxsrv-7b3f315a5d8b90dcb0db5512ed91fa700027cb7a.zip | |
fontconfig xserver mesa git update 30 oct 2012
fontconfig: bdaef0b80dc27f4ab7a9d9bcedcfd8b5724b3cfd
xserver: 1ca096d5e07221025c4c4110528772b7d94f15ee
mesa: 0a66ced8f822b0d5478b0cd6d72c1a6ad70647a2
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 e32421610..c7108a5d3 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 */ |