diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/dix-config.h.in | 3 | ||||
| -rw-r--r-- | include/dix.h | 4 | ||||
| -rw-r--r-- | include/dixstruct.h | 3 | ||||
| -rw-r--r-- | include/globals.h | 6 | ||||
| -rw-r--r-- | include/os.h | 11 | ||||
| -rw-r--r-- | include/propertyst.h | 8 | ||||
| -rw-r--r-- | include/swaprep.h | 11 |
7 files changed, 1 insertions, 45 deletions
diff --git a/include/dix-config.h.in b/include/dix-config.h.in index f33e5827f..4c3a4b7a0 100644 --- a/include/dix-config.h.in +++ b/include/dix-config.h.in @@ -374,9 +374,6 @@ /* Support Xv extension */ #undef XV -/* Build LBX extension */ -#undef LBX - /* Build APPGROUP extension */ #undef XAPPGROUP diff --git a/include/dix.h b/include/dix.h index 1b8fc4265..1687f751a 100644 --- a/include/dix.h +++ b/include/dix.h @@ -368,10 +368,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/include/dixstruct.h b/include/dixstruct.h index d7d810272..f38a64d07 100644 --- a/include/dixstruct.h +++ b/include/dixstruct.h @@ -129,9 +129,6 @@ typedef struct _Client { unsigned char requestLog[MAX_REQUEST_LOG]; int requestLogIndex; #endif -#ifdef LBX - int (*readRequest)(ClientPtr /*client*/); -#endif unsigned long replyBytesRemaining; #ifdef XCSECURITY XID authId; diff --git a/include/globals.h b/include/globals.h index a661d8b63..95e11fe70 100644 --- a/include/globals.h +++ b/include/globals.h @@ -1,4 +1,4 @@ -/* $XdotOrg: xserver/xorg/include/globals.h,v 1.10 2006/01/08 23:43:54 ajax Exp $ */ +/* $XdotOrg: xserver/xorg/include/globals.h,v 1.11 2006/04/05 21:08:45 fredrik Exp $ */ /* $XFree86: xc/programs/Xserver/include/globals.h,v 1.3 1999/09/25 14:38:21 dawes Exp $ */ #ifndef _XSERV_GLOBAL_H_ @@ -84,10 +84,6 @@ extern Bool noFontCacheExtension; extern Bool noGlxExtension; #endif -#ifdef LBX -extern Bool noLbxExtension; -#endif - #ifdef SCREENSAVER extern Bool noScreenSaverExtension; #endif diff --git a/include/os.h b/include/os.h index 5a2e6c972..0885bb298 100644 --- a/include/os.h +++ b/include/os.h @@ -109,14 +109,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*/, @@ -176,10 +169,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/include/propertyst.h b/include/propertyst.h index 177fca171..9502a7261 100644 --- a/include/propertyst.h +++ b/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 */ pointer 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/include/swaprep.h b/include/swaprep.h index 2c026c659..d18b39f0c 100644 --- a/include/swaprep.h +++ b/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 */, |