diff options
author | marha <marha@users.sourceforge.net> | 2012-04-16 09:37:37 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-04-16 09:43:48 +0200 |
commit | 00eae6f01bf11ec6a90dfc68e607b6a1a250a118 (patch) | |
tree | b814d518076840b7433d02bc3b5957c1dd54de25 /xorg-server/Xi/chgptr.h | |
parent | a50d2ee664302147942dd5ed6428f9bab9d4e76a (diff) | |
parent | d6d3999ccb2cb72d55820770260172eccbbb68d7 (diff) | |
download | vcxsrv-00eae6f01bf11ec6a90dfc68e607b6a1a250a118.tar.gz vcxsrv-00eae6f01bf11ec6a90dfc68e607b6a1a250a118.tar.bz2 vcxsrv-00eae6f01bf11ec6a90dfc68e607b6a1a250a118.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/Xext/securitysrv.h
xorg-server/glx/glxext.h
xorg-server/glx/indirect_reqsize.c
xorg-server/glx/indirect_size_get.c
xorg-server/hw/xwin/winclip.c
xorg-server/hw/xwin/winfont.c
xorg-server/hw/xwin/winglobals.c
xorg-server/hw/xwin/winglobals.h
xorg-server/hw/xwin/winmonitors.h
xorg-server/include/closestr.h
xorg-server/include/pixmapstr.h
xorg-server/include/servermd.h
xorg-server/include/site.h
xorg-server/include/windowstr.h
xorg-server/include/xkbstr.h
Diffstat (limited to 'xorg-server/Xi/chgptr.h')
-rw-r--r-- | xorg-server/Xi/chgptr.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/xorg-server/Xi/chgptr.h b/xorg-server/Xi/chgptr.h index 2d8ab66e5..47265b3bc 100644 --- a/xorg-server/Xi/chgptr.h +++ b/xorg-server/Xi/chgptr.h @@ -30,19 +30,19 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef CHGPTR_H #define CHGPTR_H 1 -int SProcXChangePointerDevice(ClientPtr /* client */ +int SProcXChangePointerDevice(ClientPtr /* client */ ); -int ProcXChangePointerDevice(ClientPtr /* client */ +int ProcXChangePointerDevice(ClientPtr /* client */ ); -void DeleteFocusClassDeviceStruct(DeviceIntPtr /* dev */ +void DeleteFocusClassDeviceStruct(DeviceIntPtr /* dev */ ); void SendEventToAllWindows(DeviceIntPtr /* dev */ , - Mask /* mask */ , - xEvent * /* ev */ , - int /* count */ + Mask /* mask */ , + xEvent * /* ev */ , + int /* count */ ); -#endif /* CHGPTR_H */ +#endif /* CHGPTR_H */ |