diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-04-19 11:53:59 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-01 11:07:46 +0200 |
| commit | 74a1e4e83082635666feda5a00a468b4b47be0d6 (patch) | |
| tree | 41df640f565ea1024845e54085bed685363dcc80 | |
| parent | 2f0d2d388638dbad4db35cd07979955909ed3dbb (diff) | |
| download | nx-libs-74a1e4e83082635666feda5a00a468b4b47be0d6.tar.gz nx-libs-74a1e4e83082635666feda5a00a468b4b47be0d6.tar.bz2 nx-libs-74a1e4e83082635666feda5a00a468b4b47be0d6.zip | |
MULTIBUFFER: Drop all Xserver code blocks that relate to removed MULTIBUFFER extension.
| -rw-r--r-- | nx-X11/programs/Xserver/Xext/extmod/modinit.h | 6 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/include/globals.h | 4 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/mi/miinitext.c | 12 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/os/utils.c | 3 |
4 files changed, 0 insertions, 25 deletions
diff --git a/nx-X11/programs/Xserver/Xext/extmod/modinit.h b/nx-X11/programs/Xserver/Xext/extmod/modinit.h index cc0638aed..10ec05a92 100644 --- a/nx-X11/programs/Xserver/Xext/extmod/modinit.h +++ b/nx-X11/programs/Xserver/Xext/extmod/modinit.h @@ -15,12 +15,6 @@ extern void ShapeExtensionInit(INITARGS); #include <nx-X11/extensions/shapestr.h> #endif -#ifdef MULTIBUFFER -extern void MultibufferExtensionInit(INITARGS); -#define _MULTIBUF_SERVER_ /* don't want Xlib structures */ -#include <nx-X11/extensions/multibufst.h> -#endif - #ifdef MITMISC extern void MITMiscExtensionInit(INITARGS); #define _MITMISC_SERVER_ 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 diff --git a/nx-X11/programs/Xserver/mi/miinitext.c b/nx-X11/programs/Xserver/mi/miinitext.c index 3f4d138c0..c9865413d 100644 --- a/nx-X11/programs/Xserver/mi/miinitext.c +++ b/nx-X11/programs/Xserver/mi/miinitext.c @@ -105,9 +105,6 @@ extern Bool noMITShmExtension; #ifdef MITMISC extern Bool noMITMiscExtension; #endif -#ifdef MULTIBUFFER -extern Bool noMultibufferExtension; -#endif #ifdef RANDR extern Bool noRRExtension; #endif @@ -206,9 +203,6 @@ extern void ShapeExtensionInit(INITARGS); #ifdef MITSHM extern void ShmExtensionInit(INITARGS); #endif -#ifdef MULTIBUFFER -extern void MultibufferExtensionInit(INITARGS); -#endif #ifdef PANORAMIX extern void PanoramiXExtensionInit(INITARGS); #endif @@ -348,9 +342,6 @@ static ExtensionToggle ExtensionToggleList[] = #ifdef MITMISC { "MIT-SUNDRY-NONSTANDARD", &noMITMiscExtension }, #endif -#ifdef MULTIBUFFER - { "Multi-Buffering", &noMultibufferExtension }, -#endif #ifdef RANDR { "RANDR", &noRRExtension }, #endif @@ -453,9 +444,6 @@ InitExtensions(argc, argv) #ifdef MITSHM if (!noMITShmExtension) ShmExtensionInit(); #endif -#ifdef MULTIBUFFER - if (!noMultibufferExtension) MultibufferExtensionInit(); -#endif #if defined(XINPUT) && !defined(NO_HW_ONLY_EXTS) if (!noXInputExtension) XInputExtensionInit(); #endif diff --git a/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c index d85ab83c8..25eff944f 100644 --- a/nx-X11/programs/Xserver/os/utils.c +++ b/nx-X11/programs/Xserver/os/utils.c @@ -180,9 +180,6 @@ Bool noMITShmExtension = FALSE; #ifdef MITMISC Bool noMITMiscExtension = FALSE; #endif -#ifdef MULTIBUFFER -Bool noMultibufferExtension = FALSE; -#endif #ifdef RANDR Bool noRRExtension = FALSE; #endif |