aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/mi
diff options
context:
space:
mode:
authorEric Anholt <anholt@freebsd.org>2016-10-29 11:28:02 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-12-04 21:11:41 +0100
commit508d2deae98846111299a3693033a507010e3c91 (patch)
treeee0d60bb4a9c500f6072891a7802fd06be15ce8a /nx-X11/programs/Xserver/mi
parent62f8e50e7a5ddc6952a951edc37ee53c2a828675 (diff)
downloadnx-libs-508d2deae98846111299a3693033a507010e3c91.tar.gz
nx-libs-508d2deae98846111299a3693033a507010e3c91.tar.bz2
nx-libs-508d2deae98846111299a3693033a507010e3c91.zip
Remove libcwrapper usage from xorg server modules. The libcwrapper is not used in nxagent.
From c3d14036729fd186d4ec7ca1de603e1f2d174e2f Mon Sep 17 00:00:00 2001 From: Eric Anholt <anholt@freebsd.org> Date: Fri, 10 Feb 2006 22:00:30 +0000 Subject: Remove libcwrapper usage from xorg server modules. The libcwrapper is only of (marginal) use in the drivers, and that usage remains. Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fixes ArcticaProject/nx-libs#246 (together with merge commit ecd335fa61551d0b86d3f075469a7743ab899d95).
Diffstat (limited to 'nx-X11/programs/Xserver/mi')
-rw-r--r--nx-X11/programs/Xserver/mi/Imakefile10
-rw-r--r--nx-X11/programs/Xserver/mi/miinitext.c104
2 files changed, 4 insertions, 110 deletions
diff --git a/nx-X11/programs/Xserver/mi/Imakefile b/nx-X11/programs/Xserver/mi/Imakefile
index fda19aa59..1d50c9156 100644
--- a/nx-X11/programs/Xserver/mi/Imakefile
+++ b/nx-X11/programs/Xserver/mi/Imakefile
@@ -141,14 +141,12 @@ OBJS = $(CBRT_OBJ) \
* in order to build the XInputExtension, since we
* don't use the XF86 module loader.
*/
-
EXT_DEFINES = ExtensionDefines \
- -UXFree86LOADER
-
+ $(NULL)
#else
-
-EXT_DEFINES = ExtensionDefines -UXINPUT \
- -UXFree86LOADER
+EXT_DEFINES = ExtensionDefines \
+ -UXINPUT \
+ $(NULL)
#endif
#endif
diff --git a/nx-X11/programs/Xserver/mi/miinitext.c b/nx-X11/programs/Xserver/mi/miinitext.c
index b48ed8a1c..fc64937d7 100644
--- a/nx-X11/programs/Xserver/mi/miinitext.c
+++ b/nx-X11/programs/Xserver/mi/miinitext.c
@@ -146,12 +146,8 @@ extern Bool noXIdleExtension;
extern Bool noXvExtension;
#endif
-#ifndef XFree86LOADER
#define INITARGS void
typedef void (*InitExtension)(void);
-#else /* XFree86Loader */
-#include "loaderProcs.h"
-#endif
#ifdef MITSHM
#define _XSHM_SERVER_
@@ -380,8 +376,6 @@ void EnableDisableExtensionError(char *name, Bool enable)
ErrorF(" %s\n", ext->name);
}
-#ifndef XFree86LOADER
-
/*ARGSUSED*/
void
InitExtensions(argc, argv)
@@ -496,101 +490,3 @@ InitVisualWrap()
#endif
}
-#else /* XFree86LOADER */
-/* List of built-in (statically linked) extensions */
-static ExtensionModule staticExtensions[] = {
-#ifdef XTESTEXT1
- { XTestExtension1Init, "XTEST1", &noTestExtensions, NULL, NULL },
-#endif
-#ifdef MITSHM
- { ShmExtensionInit, SHMNAME, &noMITShmExtension, NULL, NULL },
-#endif
-#ifdef XINPUT
- { XInputExtensionInit, "XInputExtension", &noXInputExtension, NULL, NULL },
-#endif
-#ifdef XTEST
- { XTestExtensionInit, XTestExtensionName, &noTestExtensions, NULL, NULL },
-#endif
-#ifdef XIDLE
- { XIdleExtensionInit, "XIDLE", &noXIdleExtension, NULL, NULL },
-#endif
-#ifdef XKB
- { XkbExtensionInit, XkbName, &noXkbExtension, NULL, NULL },
-#endif
-#ifdef XCSECURITY
- { SecurityExtensionInit, SECURITY_EXTENSION_NAME, &noSecurityExtension, NULL, NULL },
-#endif
-#ifdef PANORAMIX
- { PanoramiXExtensionInit, PANORAMIX_PROTOCOL_NAME, &noPanoramiXExtension, NULL, NULL },
-#endif
-#ifdef XFIXES
- /* must be before Render to layer DisplayCursor correctly */
- { XFixesExtensionInit, "XFIXES", &noXFixesExtension, NULL, NULL },
-#endif
-#ifdef XF86BIGFONT
- { XFree86BigfontExtensionInit, XF86BIGFONTNAME, &noXFree86BigfontExtension, NULL, NULL },
-#endif
-#ifdef RENDER
- { RenderExtensionInit, "RENDER", &noRenderExtension, NULL, NULL },
-#endif
-#ifdef RANDR
- { RRExtensionInit, "RANDR", &noRRExtension, NULL, NULL },
-#endif
-#ifdef COMPOSITE
- { CompositeExtensionInit, "COMPOSITE", &noCompositeExtension, NULL },
-#endif
-#ifdef DAMAGE
- { DamageExtensionInit, "DAMAGE", &noDamageExtension, NULL },
-#endif
- { NULL, NULL, NULL, NULL, NULL }
-};
-
-/*ARGSUSED*/
-void
-InitExtensions(argc, argv)
- int argc;
- char *argv[];
-{
- int i;
- ExtensionModule *ext;
- static Bool listInitialised = FALSE;
-
- if (!listInitialised) {
- /* Add built-in extensions to the list. */
- for (i = 0; staticExtensions[i].name; i++)
- LoadExtension(&staticExtensions[i], TRUE);
-
- /* Sort the extensions according the init dependencies. */
- LoaderSortExtensions();
- listInitialised = TRUE;
- }
-
- for (i = 0; ExtensionModuleList[i].name != NULL; i++) {
- ext = &ExtensionModuleList[i];
- if (ext->initFunc != NULL &&
- (ext->disablePtr == NULL ||
- (ext->disablePtr != NULL && !*ext->disablePtr))) {
- (ext->initFunc)();
- }
- }
-}
-
-static void (*__miHookInitVisualsFunction)(miInitVisualsProcPtr *);
-
-void
-InitVisualWrap()
-{
- miResetInitVisuals();
- if (__miHookInitVisualsFunction)
- (*__miHookInitVisualsFunction)(&miInitVisualsProc);
-}
-
-void miHookInitVisuals(void (**old)(miInitVisualsProcPtr *),
- void (*new)(miInitVisualsProcPtr *))
-{
- if (old)
- *old = __miHookInitVisualsFunction;
- __miHookInitVisualsFunction = new;
-}
-
-#endif /* XFree86LOADER */