diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2007-04-02 15:36:26 +0930 |
|---|---|---|
| committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2007-04-02 15:36:26 +0930 |
| commit | e8777a91f37d828b9df839bf3d9cf2f954bdddb0 (patch) | |
| tree | 07dbc5bb75954b39eb84809907f58025b3419773 /Xi/chgdctl.c | |
| parent | a12054757d21edacc1c24c3077b9214726652829 (diff) | |
| parent | 96ce17aa94413c4b8bcb61cae71167050130a307 (diff) | |
Merge branch 'master' into mpx
Conflicts:
Xi/closedev.c
Xi/exevents.c
Xi/extinit.c
Xi/listdev.c
dix/window.c
hw/xfree86/common/xf86Xinput.c
include/extinit.h
mi/mipointer.c
Diffstat (limited to 'Xi/chgdctl.c')
| -rw-r--r-- | Xi/chgdctl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Xi/chgdctl.c b/Xi/chgdctl.c index 899015a02..def3b702d 100644 --- a/Xi/chgdctl.c +++ b/Xi/chgdctl.c @@ -78,9 +78,9 @@ SOFTWARE. */ int -SProcXChangeDeviceControl(register ClientPtr client) +SProcXChangeDeviceControl(ClientPtr client) { - register char n; + char n; REQUEST(xChangeDeviceControlReq); swaps(&stuff->length, n); @@ -287,7 +287,7 @@ void SRepXChangeDeviceControl(ClientPtr client, int size, xChangeDeviceControlReply * rep) { - register char n; + char n; swaps(&rep->sequenceNumber, n); swapl(&rep->length, n); |