diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-17 19:03:47 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-17 19:03:47 +0000 |
| commit | c57959ad6a4c0f5329762f401fd7871ffb2ee90c (patch) | |
| tree | f223828f827382311611edf114ddd0c42cb3b23f /Xi/devbell.c | |
| parent | 9508a382f8a9f241dab097d921b6d290c1c3a776 (diff) | |
merge XFree86 4.3.0.1 to -CURRENT
Diffstat (limited to 'Xi/devbell.c')
| -rw-r--r-- | Xi/devbell.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Xi/devbell.c b/Xi/devbell.c index 60e58e147..98520ec1c 100644 --- a/Xi/devbell.c +++ b/Xi/devbell.c @@ -45,6 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +/* $XFree86: xc/programs/Xserver/Xi/devbell.c,v 3.3 2001/12/14 19:58:55 dawes Exp $ */ /*********************************************************************** * @@ -59,11 +60,11 @@ SOFTWARE. #include "inputstr.h" /* DeviceIntPtr */ #include "XI.h" #include "XIproto.h" +#include "extnsionst.h" +#include "extinit.h" /* LookupDeviceIntRec */ +#include "exglobals.h" -extern int IReqCode; -extern int BadDevice; -extern void (* ReplySwapVector[256]) (); -DeviceIntPtr LookupDeviceIntRec(); +#include "devbell.h" /*********************************************************************** * @@ -89,6 +90,7 @@ SProcXDeviceBell(client) * */ +int ProcXDeviceBell (client) register ClientPtr client; { @@ -99,7 +101,7 @@ ProcXDeviceBell (client) int newpercent; CARD8 class; pointer ctrl; - void (*proc)(); + BellProcPtr proc; REQUEST(xDeviceBellReq); REQUEST_SIZE_MATCH(xDeviceBellReq); |