drop .original files from the current code base

2 files changed, 0 insertions, 469 deletions

diff --git a/nx-X11/programs/Xserver/include/dixstruct.h.NX.original b/nx-X11/programs/Xserver/include/dixstruct.h.NX.original
deleted file mode 100644
index 6266ec9f8..000000000
--- a/nx-X11/programs/Xserver/include/dixstruct.h.NX.original
+++ /dev/null
@@ -1,236 +0,0 @@
-/* $XFree86: xc/programs/Xserver/include/dixstruct.h,v 3.19tsi Exp $ */
-/***********************************************************
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-/* $Xorg: dixstruct.h,v 1.3 2000/08/17 19:53:29 cpqbld Exp $ */
-
-#ifndef DIXSTRUCT_H
-#define DIXSTRUCT_H
-
-#include "dix.h"
-#include "resource.h"
-#include "cursor.h"
-#include "gc.h"
-#include "pixmap.h"
-#include <X11/Xmd.h>
-
-/*
- * 	direct-mapped hash table, used by resource manager to store
- *      translation from client ids to server addresses.
- */
-
-#ifdef DEBUG
-#define MAX_REQUEST_LOG 100
-#endif
-
-extern CallbackListPtr ClientStateCallback;
-
-typedef struct {
-    ClientPtr 		client;
-    xConnSetupPrefix 	*prefix; 
-    xConnSetup  	*setup;
-} NewClientInfoRec;
-
-typedef void (*ReplySwapPtr) (
-		ClientPtr	/* pClient */,
-		int		/* size */,
-		void *		/* pbuf */);
-
-extern void ReplyNotSwappd (
-		ClientPtr	/* pClient */,
-		int		/* size */,
-		void *		/* pbuf */);
-
-typedef enum {ClientStateInitial,
-	      ClientStateAuthenticating,
-	      ClientStateRunning,
-	      ClientStateRetained,
-	      ClientStateGone,
-	      ClientStateCheckingSecurity,
-	      ClientStateCheckedSecurity} ClientState;
-
-#ifdef XFIXES
-typedef struct _saveSet {
-    struct _Window  *windowPtr;
-    Bool	    toRoot;
-    Bool	    remap;
-} SaveSetElt;
-#define SaveSetWindow(ss)   ((ss).windowPtr)
-#define SaveSetToRoot(ss)   ((ss).toRoot)
-#define SaveSetRemap(ss)    ((ss).remap)
-#define SaveSetAssignWindow(ss,w)   ((ss).windowPtr = (w))
-#define SaveSetAssignToRoot(ss,tr)  ((ss).toRoot = (tr))
-#define SaveSetAssignRemap(ss,rm)  ((ss).remap = (rm))
-#else
-typedef struct _Window *SaveSetElt;
-#define SaveSetWindow(ss)   (ss)
-#define SaveSetToRoot(ss)   FALSE
-#define SaveSetRemap(ss)    TRUE
-#define SaveSetAssignWindow(ss,w)   ((ss) = (w))
-#define SaveSetAssignToRoot(ss,tr)
-#define SaveSetAssignRemap(ss,rm)
-#endif
-
-typedef struct _Client {
-    int         index;
-    Mask        clientAsMask;
-    pointer     requestBuffer;
-    pointer     osPrivate;	/* for OS layer, including scheduler */
-    Bool        swapped;
-    ReplySwapPtr pSwapReplyFunc;
-    XID         errorValue;
-    int         sequence;
-    int         closeDownMode;
-    int         clientGone;
-    int         noClientException;	/* this client died or needs to be
-					 * killed */
-    DrawablePtr lastDrawable;
-    Drawable    lastDrawableID;
-    GCPtr       lastGC;
-    GContext    lastGCID;
-    SaveSetElt	*saveSet;
-    int         numSaved;
-    pointer     screenPrivate[MAXSCREENS];
-    int         (**requestVector) (
-		ClientPtr /* pClient */);
-    CARD32	req_len;		/* length of current request */
-    Bool	big_requests;		/* supports large requests */
-    int		priority;
-    ClientState clientState;
-    DevUnion	*devPrivates;
-#ifdef XKB
-    unsigned short	xkbClientFlags;
-    unsigned short	mapNotifyMask;
-    unsigned short	newKeyboardNotifyMask;
-    unsigned short	vMajor,vMinor;
-    KeyCode		minKC,maxKC;
-#endif
-
-#ifdef DEBUG
-    unsigned char requestLog[MAX_REQUEST_LOG];
-    int         requestLogIndex;
-#endif
-#ifdef LBX
-    int		(*readRequest)(ClientPtr /*client*/);
-#endif
-    unsigned long replyBytesRemaining;
-#ifdef XCSECURITY
-    XID		authId;
-    unsigned int trustLevel;
-    pointer (* CheckAccess)(
-	    ClientPtr /*pClient*/,
-	    XID /*id*/,
-	    RESTYPE /*classes*/,
-	    Mask /*access_mode*/,
-	    pointer /*resourceval*/);
-#endif
-#ifdef XAPPGROUP
-    struct _AppGroupRec*	appgroup;
-#endif
-    struct _FontResolution * (*fontResFunc) (    /* no need for font.h */
-		ClientPtr	/* pClient */,
-		int *		/* num */);
-#ifdef SMART_SCHEDULE
-    int	    smart_priority;
-    long    smart_start_tick;
-    long    smart_stop_tick;
-    long    smart_check_tick;
-#endif
-}           ClientRec;
-
-#ifdef SMART_SCHEDULE
-/*
- * Scheduling interface
- */
-extern long SmartScheduleTime;
-extern long SmartScheduleInterval;
-extern long SmartScheduleSlice;
-extern long SmartScheduleMaxSlice;
-extern unsigned long SmartScheduleIdleCount;
-extern Bool SmartScheduleDisable;
-extern Bool SmartScheduleIdle;
-extern Bool SmartScheduleTimerStopped;
-extern Bool SmartScheduleStartTimer(void);
-#ifdef NXAGENT_SERVER
-extern Bool SmartScheduleStopTimer(void);
-#endif
-#define SMART_MAX_PRIORITY  (20)
-#define SMART_MIN_PRIORITY  (-20)
-
-extern Bool SmartScheduleInit(void);
-
-#endif
-
-/* This prototype is used pervasively in Xext, dix */
-#define DISPATCH_PROC(func) int func(ClientPtr /* client */)
-
-typedef struct _WorkQueue {
-    struct _WorkQueue *next;
-    Bool        (*function) (
-		ClientPtr	/* pClient */,
-		pointer		/* closure */
-);
-    ClientPtr   client;
-    pointer     closure;
-}           WorkQueueRec;
-
-extern TimeStamp currentTime;
-extern TimeStamp lastDeviceEventTime;
-
-extern int CompareTimeStamps(
-    TimeStamp /*a*/,
-    TimeStamp /*b*/);
-
-extern TimeStamp ClientTimeToServerTime(CARD32 /*c*/);
-
-typedef struct _CallbackRec {
-  CallbackProcPtr proc;
-  pointer data;
-  Bool deleted;
-  struct _CallbackRec *next;
-} CallbackRec, *CallbackPtr;
-
-typedef struct _CallbackList {
-  CallbackFuncsRec funcs;
-  int inCallback;
-  Bool deleted;
-  int numDeleted;
-  CallbackPtr list;
-} CallbackListRec;
-
-/* proc vectors */
-
-extern int (* InitialVector[3]) (ClientPtr /*client*/);
-
-extern int (* ProcVector[256]) (ClientPtr /*client*/);
-
-extern int (* SwappedProcVector[256]) (ClientPtr /*client*/);
-
-#ifdef K5AUTH
-extern int (*k5_Vector[256])(ClientPtr /*client*/);
-#endif
-
-extern ReplySwapPtr ReplySwapVector[256];
-
-extern int ProcBadRequest(ClientPtr /*client*/);
-
-#endif				/* DIXSTRUCT_H */
diff --git a/nx-X11/programs/Xserver/include/dixstruct.h.X.original b/nx-X11/programs/Xserver/include/dixstruct.h.X.original
deleted file mode 100644
index d7d810272..000000000
--- a/nx-X11/programs/Xserver/include/dixstruct.h.X.original
+++ /dev/null
@@ -1,233 +0,0 @@
-/* $XFree86: xc/programs/Xserver/include/dixstruct.h,v 3.19tsi Exp $ */
-/***********************************************************
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-/* $Xorg: dixstruct.h,v 1.3 2000/08/17 19:53:29 cpqbld Exp $ */
-
-#ifndef DIXSTRUCT_H
-#define DIXSTRUCT_H
-
-#include "dix.h"
-#include "resource.h"
-#include "cursor.h"
-#include "gc.h"
-#include "pixmap.h"
-#include <X11/Xmd.h>
-
-/*
- * 	direct-mapped hash table, used by resource manager to store
- *      translation from client ids to server addresses.
- */
-
-#ifdef DEBUG
-#define MAX_REQUEST_LOG 100
-#endif
-
-extern CallbackListPtr ClientStateCallback;
-
-typedef struct {
-    ClientPtr 		client;
-    xConnSetupPrefix 	*prefix; 
-    xConnSetup  	*setup;
-} NewClientInfoRec;
-
-typedef void (*ReplySwapPtr) (
-		ClientPtr	/* pClient */,
-		int		/* size */,
-		void *		/* pbuf */);
-
-extern void ReplyNotSwappd (
-		ClientPtr	/* pClient */,
-		int		/* size */,
-		void *		/* pbuf */);
-
-typedef enum {ClientStateInitial,
-	      ClientStateAuthenticating,
-	      ClientStateRunning,
-	      ClientStateRetained,
-	      ClientStateGone,
-	      ClientStateCheckingSecurity,
-	      ClientStateCheckedSecurity} ClientState;
-
-#ifdef XFIXES
-typedef struct _saveSet {
-    struct _Window  *windowPtr;
-    Bool	    toRoot;
-    Bool	    remap;
-} SaveSetElt;
-#define SaveSetWindow(ss)   ((ss).windowPtr)
-#define SaveSetToRoot(ss)   ((ss).toRoot)
-#define SaveSetRemap(ss)    ((ss).remap)
-#define SaveSetAssignWindow(ss,w)   ((ss).windowPtr = (w))
-#define SaveSetAssignToRoot(ss,tr)  ((ss).toRoot = (tr))
-#define SaveSetAssignRemap(ss,rm)  ((ss).remap = (rm))
-#else
-typedef struct _Window *SaveSetElt;
-#define SaveSetWindow(ss)   (ss)
-#define SaveSetToRoot(ss)   FALSE
-#define SaveSetRemap(ss)    TRUE
-#define SaveSetAssignWindow(ss,w)   ((ss) = (w))
-#define SaveSetAssignToRoot(ss,tr)
-#define SaveSetAssignRemap(ss,rm)
-#endif
-
-typedef struct _Client {
-    int         index;
-    Mask        clientAsMask;
-    pointer     requestBuffer;
-    pointer     osPrivate;	/* for OS layer, including scheduler */
-    Bool        swapped;
-    ReplySwapPtr pSwapReplyFunc;
-    XID         errorValue;
-    int         sequence;
-    int         closeDownMode;
-    int         clientGone;
-    int         noClientException;	/* this client died or needs to be
-					 * killed */
-    DrawablePtr lastDrawable;
-    Drawable    lastDrawableID;
-    GCPtr       lastGC;
-    GContext    lastGCID;
-    SaveSetElt	*saveSet;
-    int         numSaved;
-    pointer     screenPrivate[MAXSCREENS];
-    int         (**requestVector) (
-		ClientPtr /* pClient */);
-    CARD32	req_len;		/* length of current request */
-    Bool	big_requests;		/* supports large requests */
-    int		priority;
-    ClientState clientState;
-    DevUnion	*devPrivates;
-#ifdef XKB
-    unsigned short	xkbClientFlags;
-    unsigned short	mapNotifyMask;
-    unsigned short	newKeyboardNotifyMask;
-    unsigned short	vMajor,vMinor;
-    KeyCode		minKC,maxKC;
-#endif
-
-#ifdef DEBUG
-    unsigned char requestLog[MAX_REQUEST_LOG];
-    int         requestLogIndex;
-#endif
-#ifdef LBX
-    int		(*readRequest)(ClientPtr /*client*/);
-#endif
-    unsigned long replyBytesRemaining;
-#ifdef XCSECURITY
-    XID		authId;
-    unsigned int trustLevel;
-    pointer (* CheckAccess)(
-	    ClientPtr /*pClient*/,
-	    XID /*id*/,
-	    RESTYPE /*classes*/,
-	    Mask /*access_mode*/,
-	    pointer /*resourceval*/);
-#endif
-#ifdef XAPPGROUP
-    struct _AppGroupRec*	appgroup;
-#endif
-    struct _FontResolution * (*fontResFunc) (    /* no need for font.h */
-		ClientPtr	/* pClient */,
-		int *		/* num */);
-#ifdef SMART_SCHEDULE
-    int	    smart_priority;
-    long    smart_start_tick;
-    long    smart_stop_tick;
-    long    smart_check_tick;
-#endif
-}           ClientRec;
-
-#ifdef SMART_SCHEDULE
-/*
- * Scheduling interface
- */
-extern long SmartScheduleTime;
-extern long SmartScheduleInterval;
-extern long SmartScheduleSlice;
-extern long SmartScheduleMaxSlice;
-extern unsigned long SmartScheduleIdleCount;
-extern Bool SmartScheduleDisable;
-extern Bool SmartScheduleIdle;
-extern Bool SmartScheduleTimerStopped;
-extern Bool SmartScheduleStartTimer(void);
-#define SMART_MAX_PRIORITY  (20)
-#define SMART_MIN_PRIORITY  (-20)
-
-extern Bool SmartScheduleInit(void);
-
-#endif
-
-/* This prototype is used pervasively in Xext, dix */
-#define DISPATCH_PROC(func) int func(ClientPtr /* client */)
-
-typedef struct _WorkQueue {
-    struct _WorkQueue *next;
-    Bool        (*function) (
-		ClientPtr	/* pClient */,
-		pointer		/* closure */
-);
-    ClientPtr   client;
-    pointer     closure;
-}           WorkQueueRec;
-
-extern TimeStamp currentTime;
-extern TimeStamp lastDeviceEventTime;
-
-extern int CompareTimeStamps(
-    TimeStamp /*a*/,
-    TimeStamp /*b*/);
-
-extern TimeStamp ClientTimeToServerTime(CARD32 /*c*/);
-
-typedef struct _CallbackRec {
-  CallbackProcPtr proc;
-  pointer data;
-  Bool deleted;
-  struct _CallbackRec *next;
-} CallbackRec, *CallbackPtr;
-
-typedef struct _CallbackList {
-  CallbackFuncsRec funcs;
-  int inCallback;
-  Bool deleted;
-  int numDeleted;
-  CallbackPtr list;
-} CallbackListRec;
-
-/* proc vectors */
-
-extern int (* InitialVector[3]) (ClientPtr /*client*/);
-
-extern int (* ProcVector[256]) (ClientPtr /*client*/);
-
-extern int (* SwappedProcVector[256]) (ClientPtr /*client*/);
-
-#ifdef K5AUTH
-extern int (*k5_Vector[256])(ClientPtr /*client*/);
-#endif
-
-extern ReplySwapPtr ReplySwapVector[256];
-
-extern int ProcBadRequest(ClientPtr /*client*/);
-
-#endif				/* DIXSTRUCT_H */