From 683415dfe516f14a6825a1f6f14af03f44192727 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 19 Apr 2016 11:05:41 +0200 Subject: XAPPGROUP: Drop all Xserver code blocks that relate to removed XAPPGROUP extension. --- nx-X11/programs/Xserver/include/dixstruct.h | 3 --- nx-X11/programs/Xserver/include/globals.h | 4 ---- 2 files changed, 7 deletions(-) (limited to 'nx-X11/programs/Xserver/include') diff --git a/nx-X11/programs/Xserver/include/dixstruct.h b/nx-X11/programs/Xserver/include/dixstruct.h index e4b5e9fe8..aafce9fcc 100644 --- a/nx-X11/programs/Xserver/include/dixstruct.h +++ b/nx-X11/programs/Xserver/include/dixstruct.h @@ -142,9 +142,6 @@ typedef struct _Client { RESTYPE /*classes*/, Mask /*access_mode*/, void * /*resourceval*/); -#endif -#ifdef XAPPGROUP - struct _AppGroupRec* appgroup; #endif struct _FontResolution * (*fontResFunc) ( /* no need for font.h */ ClientPtr /* pClient */, diff --git a/nx-X11/programs/Xserver/include/globals.h b/nx-X11/programs/Xserver/include/globals.h index bb6aa80d3..944d196bf 100644 --- a/nx-X11/programs/Xserver/include/globals.h +++ b/nx-X11/programs/Xserver/include/globals.h @@ -133,10 +133,6 @@ extern Bool noXcupExtension; extern Bool noResExtension; #endif -#ifdef XAPPGROUP -extern Bool noXagExtension; -#endif - #ifdef XCMISC extern Bool noXCMiscExtension; #endif -- cgit v1.2.3 From a25c0de093f6fccb9ca802cacb7ac0f0f106f9f2 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 19 Apr 2016 11:07:49 +0200 Subject: TOGCUP: Drop all Xserver code blocks that relate to removed TOGCUP extension. --- nx-X11/programs/Xserver/include/globals.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'nx-X11/programs/Xserver/include') diff --git a/nx-X11/programs/Xserver/include/globals.h b/nx-X11/programs/Xserver/include/globals.h index 944d196bf..91023aeb0 100644 --- a/nx-X11/programs/Xserver/include/globals.h +++ b/nx-X11/programs/Xserver/include/globals.h @@ -125,10 +125,6 @@ extern Bool noSecurityExtension; extern Bool noSyncExtension; #endif -#ifdef TOGCUP -extern Bool noXcupExtension; -#endif - #ifdef RES extern Bool noResExtension; #endif -- cgit v1.2.3 From 3aedac174068048f44f0cca0f70edb4004150cd3 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 19 Apr 2016 11:02:14 +0200 Subject: XEVIE: Drop all Xserver code blocks that relate to removed XEVIE extension. --- nx-X11/programs/Xserver/include/cursorstr.h | 3 --- nx-X11/programs/Xserver/include/globals.h | 4 ---- nx-X11/programs/Xserver/include/windowstr.h | 4 ---- 3 files changed, 11 deletions(-) (limited to 'nx-X11/programs/Xserver/include') diff --git a/nx-X11/programs/Xserver/include/cursorstr.h b/nx-X11/programs/Xserver/include/cursorstr.h index 894467289..d5d82576b 100644 --- a/nx-X11/programs/Xserver/include/cursorstr.h +++ b/nx-X11/programs/Xserver/include/cursorstr.h @@ -92,7 +92,4 @@ typedef struct { ScreenPtr pScreen; } HotSpot; -#ifdef XEVIE -extern HotSpot xeviehot; -#endif #endif /* CURSORSTRUCT_H */ diff --git a/nx-X11/programs/Xserver/include/globals.h b/nx-X11/programs/Xserver/include/globals.h index 91023aeb0..d0ffface8 100644 --- a/nx-X11/programs/Xserver/include/globals.h +++ b/nx-X11/programs/Xserver/include/globals.h @@ -133,10 +133,6 @@ extern Bool noResExtension; extern Bool noXCMiscExtension; #endif -#ifdef XEVIE -extern Bool noXevieExtension; -#endif - #ifdef XF86BIGFONT extern Bool noXFree86BigfontExtension; #endif diff --git a/nx-X11/programs/Xserver/include/windowstr.h b/nx-X11/programs/Xserver/include/windowstr.h index c32842fe3..dd9bb4653 100644 --- a/nx-X11/programs/Xserver/include/windowstr.h +++ b/nx-X11/programs/Xserver/include/windowstr.h @@ -254,8 +254,4 @@ extern ScreenSaverStuffRec savedScreenInfo[MAXSCREENS]; extern int numSaveUndersViewable; extern int deltaSaveUndersViewable; -#ifdef XEVIE -extern WindowPtr xeviewin; -#endif - #endif /* WINDOWSTRUCT_H */ -- cgit v1.2.3 From 25ffbbb2248a48968703094641c89308285895d8 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 19 Apr 2016 11:34:20 +0200 Subject: FONTCACHE: Drop all Xserver code blocks that relate to removed FONTCACHE extension. --- nx-X11/programs/Xserver/include/globals.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'nx-X11/programs/Xserver/include') diff --git a/nx-X11/programs/Xserver/include/globals.h b/nx-X11/programs/Xserver/include/globals.h index d0ffface8..905d2b522 100644 --- a/nx-X11/programs/Xserver/include/globals.h +++ b/nx-X11/programs/Xserver/include/globals.h @@ -77,10 +77,6 @@ extern Bool noDPMSExtension; extern Bool noEVIExtension; #endif -#ifdef FONTCACHE -extern Bool noFontCacheExtension; -#endif - #ifdef GLXEXT extern Bool noGlxExtension; #endif -- cgit v1.2.3 From e80842cc42980c57a08d7ae4baadd93eddf342fe Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 19 Apr 2016 11:36:27 +0200 Subject: EVI: Drop all Xserver code blocks that relate to removed EVI extension. --- nx-X11/programs/Xserver/include/globals.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'nx-X11/programs/Xserver/include') diff --git a/nx-X11/programs/Xserver/include/globals.h b/nx-X11/programs/Xserver/include/globals.h index 905d2b522..d57615de4 100644 --- a/nx-X11/programs/Xserver/include/globals.h +++ b/nx-X11/programs/Xserver/include/globals.h @@ -73,10 +73,6 @@ extern Bool noDPSExtension; extern Bool noDPMSExtension; #endif -#ifdef EVI -extern Bool noEVIExtension; -#endif - #ifdef GLXEXT extern Bool noGlxExtension; #endif -- cgit v1.2.3 From 2f0d2d388638dbad4db35cd07979955909ed3dbb Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 19 Apr 2016 11:52:13 +0200 Subject: LBX: Drop all Xserver code blocks that relate to removed LBX extension. --- nx-X11/programs/Xserver/include/dix.h | 4 ---- nx-X11/programs/Xserver/include/dixstruct.h | 3 --- nx-X11/programs/Xserver/include/globals.h | 4 ---- nx-X11/programs/Xserver/include/os.h | 11 ----------- nx-X11/programs/Xserver/include/propertyst.h | 8 -------- nx-X11/programs/Xserver/include/swaprep.h | 11 ----------- 6 files changed, 41 deletions(-) (limited to 'nx-X11/programs/Xserver/include') diff --git a/nx-X11/programs/Xserver/include/dix.h b/nx-X11/programs/Xserver/include/dix.h index 5f9d3b5d5..b7f91b6da 100644 --- a/nx-X11/programs/Xserver/include/dix.h +++ b/nx-X11/programs/Xserver/include/dix.h @@ -375,10 +375,6 @@ extern int DoGetImage( Mask /*planemask*/, xGetImageReply ** /*im_return*/); -#ifdef LBX -extern void IncrementClientCount(void); -#endif /* LBX */ - #if defined(DDXBEFORERESET) extern void ddxBeforeReset (void); #endif diff --git a/nx-X11/programs/Xserver/include/dixstruct.h b/nx-X11/programs/Xserver/include/dixstruct.h index aafce9fcc..01a1c86dc 100644 --- a/nx-X11/programs/Xserver/include/dixstruct.h +++ b/nx-X11/programs/Xserver/include/dixstruct.h @@ -128,9 +128,6 @@ typedef struct _Client { #ifdef DEBUG unsigned char requestLog[MAX_REQUEST_LOG]; int requestLogIndex; -#endif -#ifdef LBX - int (*readRequest)(ClientPtr /*client*/); #endif unsigned long replyBytesRemaining; #ifdef XCSECURITY diff --git a/nx-X11/programs/Xserver/include/globals.h b/nx-X11/programs/Xserver/include/globals.h index d57615de4..ca466f442 100644 --- a/nx-X11/programs/Xserver/include/globals.h +++ b/nx-X11/programs/Xserver/include/globals.h @@ -77,10 +77,6 @@ extern Bool noDPMSExtension; extern Bool noGlxExtension; #endif -#ifdef LBX -extern Bool noLbxExtension; -#endif - #ifdef SCREENSAVER extern Bool noScreenSaverExtension; #endif diff --git a/nx-X11/programs/Xserver/include/os.h b/nx-X11/programs/Xserver/include/os.h index e150e1e0b..aff2952fa 100644 --- a/nx-X11/programs/Xserver/include/os.h +++ b/nx-X11/programs/Xserver/include/os.h @@ -113,14 +113,7 @@ extern int WaitForSomething( int* /*pClientsReady*/ ); -#ifdef LBX -#define ReadRequestFromClient(client) ((client)->readRequest(client)) -extern int StandardReadRequestFromClient(ClientPtr /*client*/); - -extern int ClientConnectionNumber(ClientPtr /*client*/); -#else extern int ReadRequestFromClient(ClientPtr /*client*/); -#endif /* LBX */ extern Bool InsertFakeRequest( ClientPtr /*client*/, @@ -180,10 +173,6 @@ extern void MakeClientGrabImpervious(ClientPtr /*client*/); extern void MakeClientGrabPervious(ClientPtr /*client*/); -#ifdef LBX -extern void CloseDownFileDescriptor(ClientPtr /* client */); -#endif - extern void AvailableClientInput(ClientPtr /* client */); extern CARD32 GetTimeInMillis(void); diff --git a/nx-X11/programs/Xserver/include/propertyst.h b/nx-X11/programs/Xserver/include/propertyst.h index 8f9abd5f8..2bd0b270c 100644 --- a/nx-X11/programs/Xserver/include/propertyst.h +++ b/nx-X11/programs/Xserver/include/propertyst.h @@ -62,14 +62,6 @@ typedef struct _Property { short format; /* format of data for swapping - 8,16,32 */ long size; /* size of data in (format/8) bytes */ void *data; /* private to client */ -#if defined(LBX) || defined(LBX_COMPAT) - /* If space is at a premium and binary compatibility is not - * an issue, you may want to put the owner_pid next to format - * so that the two shorts pack together without padding. - */ - short owner_pid; /* proxy that has the data */ - XID tag_id; -#endif } PropertyRec; #endif /* PROPERTYSTRUCT_H */ diff --git a/nx-X11/programs/Xserver/include/swaprep.h b/nx-X11/programs/Xserver/include/swaprep.h index 2c026c659..d18b39f0c 100644 --- a/nx-X11/programs/Xserver/include/swaprep.h +++ b/nx-X11/programs/Xserver/include/swaprep.h @@ -120,17 +120,6 @@ extern void SQueryKeymapReply( int /* size */, xQueryKeymapReply * /* pRep */); -#ifdef LBX -extern void SwapCharInfo( - xCharInfo * /* pInfo */); -#endif - -#ifdef LBX -extern void SwapFont( - xQueryFontReply * /* pr */, - Bool /* hasGlyphs */); -#endif - extern void SQueryFontReply( ClientPtr /* pClient */, int /* size */, -- cgit v1.2.3 From 74a1e4e83082635666feda5a00a468b4b47be0d6 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 19 Apr 2016 11:53:59 +0200 Subject: MULTIBUFFER: Drop all Xserver code blocks that relate to removed MULTIBUFFER extension. --- nx-X11/programs/Xserver/include/globals.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'nx-X11/programs/Xserver/include') diff --git a/nx-X11/programs/Xserver/include/globals.h b/nx-X11/programs/Xserver/include/globals.h index ca466f442..40a8d9f2d 100644 --- a/nx-X11/programs/Xserver/include/globals.h +++ b/nx-X11/programs/Xserver/include/globals.h @@ -89,10 +89,6 @@ extern Bool noMITShmExtension; extern Bool noMITMiscExtension; #endif -#ifdef MULTIBUFFER -extern Bool noMultibufferExtension; -#endif - #ifdef RANDR extern Bool noRRExtension; #endif -- cgit v1.2.3 From e142314433d9de8a3fcf1c4ee801f350b32b57e2 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 19 Apr 2016 11:56:20 +0200 Subject: XF86VIDMODE: Drop all Xserver code blocks that relate to removed XF86VIDMODE extension. --- nx-X11/programs/Xserver/include/globals.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'nx-X11/programs/Xserver/include') diff --git a/nx-X11/programs/Xserver/include/globals.h b/nx-X11/programs/Xserver/include/globals.h index 40a8d9f2d..d3e8e8a38 100644 --- a/nx-X11/programs/Xserver/include/globals.h +++ b/nx-X11/programs/Xserver/include/globals.h @@ -133,10 +133,6 @@ extern Bool noXFree86DRIExtension; extern Bool noXFree86MiscExtension; #endif -#ifdef XF86VIDMODE -extern Bool noXFree86VidModeExtension; -#endif - #ifdef XFIXES extern Bool noXFixesExtension; #endif -- cgit v1.2.3 From 004f8f89682baf4767e86c271aa440251582b818 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 19 Apr 2016 11:58:37 +0200 Subject: MITMISC: Drop all Xserver code blocks that relate to removed MITMISC extension. --- nx-X11/programs/Xserver/include/globals.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'nx-X11/programs/Xserver/include') diff --git a/nx-X11/programs/Xserver/include/globals.h b/nx-X11/programs/Xserver/include/globals.h index d3e8e8a38..523e0812d 100644 --- a/nx-X11/programs/Xserver/include/globals.h +++ b/nx-X11/programs/Xserver/include/globals.h @@ -85,10 +85,6 @@ extern Bool noScreenSaverExtension; extern Bool noMITShmExtension; #endif -#ifdef MITMISC -extern Bool noMITMiscExtension; -#endif - #ifdef RANDR extern Bool noRRExtension; #endif -- cgit v1.2.3 From 2ff2c92bb79349c0d44af590620291fd0b1f6074 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 19 Apr 2016 12:02:12 +0200 Subject: XF86MISC: Drop all Xserver code blocks that relate to removed XF86MISC extension. --- nx-X11/programs/Xserver/include/globals.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'nx-X11/programs/Xserver/include') diff --git a/nx-X11/programs/Xserver/include/globals.h b/nx-X11/programs/Xserver/include/globals.h index 523e0812d..34491c42f 100644 --- a/nx-X11/programs/Xserver/include/globals.h +++ b/nx-X11/programs/Xserver/include/globals.h @@ -125,10 +125,6 @@ extern Bool noXFree86DGAExtension; extern Bool noXFree86DRIExtension; #endif -#ifdef XF86MISC -extern Bool noXFree86MiscExtension; -#endif - #ifdef XFIXES extern Bool noXFixesExtension; #endif -- cgit v1.2.3 From 8c1d16dae730ee46a2ac407a125caa2a69042474 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 19 Apr 2016 12:04:57 +0200 Subject: XFreeXDGA: Drop all Xserver code blocks that relate to removed XFreeXDGA extension. --- nx-X11/programs/Xserver/include/globals.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'nx-X11/programs/Xserver/include') diff --git a/nx-X11/programs/Xserver/include/globals.h b/nx-X11/programs/Xserver/include/globals.h index 34491c42f..f37fb68ba 100644 --- a/nx-X11/programs/Xserver/include/globals.h +++ b/nx-X11/programs/Xserver/include/globals.h @@ -117,10 +117,6 @@ extern Bool noXCMiscExtension; extern Bool noXFree86BigfontExtension; #endif -#ifdef XFreeXDGA -extern Bool noXFree86DGAExtension; -#endif - #ifdef XF86DRI extern Bool noXFree86DRIExtension; #endif -- cgit v1.2.3