merge XFree86 4.3.0.1 to -CURRENT

This commit is contained in:
Kaleb Keithley
2003-11-17 19:03:47 +00:00
parent 9508a382f8
commit c57959ad6a
615 changed files with 42990 additions and 101132 deletions

View File

@@ -45,6 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
/* $XFree86: xc/programs/Xserver/Xi/opendev.c,v 3.3 2001/12/14 19:58:58 dawes Exp $ */
/***********************************************************************
*
@@ -56,17 +57,18 @@ SOFTWARE.
#define NEED_REPLIES
#include "X.h" /* for inputstr.h */
#include "Xproto.h" /* Request macro */
#include "inputstr.h" /* DeviceIntPtr */
#include "XI.h"
#include "XIproto.h"
#include "inputstr.h" /* DeviceIntPtr */
#include "XIstubs.h"
#include "windowstr.h" /* window structure */
#include "extnsionst.h"
#include "extinit.h" /* LookupDeviceIntRec */
#include "exglobals.h"
#include "opendev.h"
extern int IReqCode;
extern int BadDevice;
extern CARD8 event_base [];
extern InputInfo inputInfo;
extern void (* ReplySwapVector[256]) ();
DeviceIntPtr LookupDeviceIntRec();
/***********************************************************************
*
@@ -102,7 +104,6 @@ ProcXOpenDevice(client)
int status = Success;
xOpenDeviceReply rep;
DeviceIntPtr dev;
void OpenInputDevice();
REQUEST(xOpenDeviceReq);
REQUEST_SIZE_MATCH(xOpenDeviceReq);
@@ -186,6 +187,7 @@ ProcXOpenDevice(client)
*
*/
void
SRepXOpenDevice (client, size, rep)
ClientPtr client;
int size;