Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nx-libs
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dimbor
nx-libs
Commits
2ff2c92b
Commit
2ff2c92b
authored
Apr 19, 2016
by
Mike Gabriel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
XF86MISC: Drop all Xserver code blocks that relate to removed XF86MISC extension.
parent
004f8f89
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
2 additions
and
28 deletions
+2
-28
modinit.h
nx-X11/programs/Xserver/Xext/extmod/modinit.h
+0
-7
globals.h
nx-X11/programs/Xserver/include/globals.h
+0
-4
Imakefile
nx-X11/programs/Xserver/mi/Imakefile
+2
-2
miinitext.c
nx-X11/programs/Xserver/mi/miinitext.c
+0
-12
utils.c
nx-X11/programs/Xserver/os/utils.c
+0
-3
No files found.
nx-X11/programs/Xserver/Xext/extmod/modinit.h
View file @
2ff2c92b
...
...
@@ -48,13 +48,6 @@ extern void XCMiscExtensionInit(INITARGS);
#include <nx-X11/extensions/xcmiscstr.h>
#endif
#ifdef XF86MISC
extern
void
XFree86MiscExtensionInit
(
INITARGS
);
#define _XF86MISC_SERVER_
#define _XF86MISC_SAVER_COMPAT_
#include <nx-X11/extensions/xf86mscstr.h>
#endif
#ifdef XFreeXDGA
extern
void
XFree86DGAExtensionInit
(
INITARGS
);
extern
void
XFree86DGARegister
(
INITARGS
);
...
...
nx-X11/programs/Xserver/include/globals.h
View file @
2ff2c92b
...
...
@@ -125,10 +125,6 @@ extern Bool noXFree86DGAExtension;
extern
Bool
noXFree86DRIExtension
;
#endif
#ifdef XF86MISC
extern
Bool
noXFree86MiscExtension
;
#endif
#ifdef XFIXES
extern
Bool
noXFixesExtension
;
#endif
...
...
nx-X11/programs/Xserver/mi/Imakefile
View file @
2ff2c92b
...
...
@@ -76,12 +76,12 @@ OBJS = $(CBRT_OBJ) mivaltree.o mipolyseg.o mipolyrect.o \
* don't use the XF86 module loader.
*/
EXT_DEFINES = ExtensionDefines -UXFreeXDGA
-UXF86MISC
\
EXT_DEFINES = ExtensionDefines -UXFreeXDGA \
-UXFree86LOADER
#else
EXT_DEFINES = ExtensionDefines -UXINPUT -UXFreeXDGA
-UXF86MISC
\
EXT_DEFINES = ExtensionDefines -UXINPUT -UXFreeXDGA \
-UXFree86LOADER
#endif
...
...
nx-X11/programs/Xserver/mi/miinitext.c
View file @
2ff2c92b
...
...
@@ -132,9 +132,6 @@ extern Bool noXFree86DGAExtension;
#ifdef XF86DRI
extern
Bool
noXFree86DRIExtension
;
#endif
#ifdef XF86MISC
extern
Bool
noXFree86MiscExtension
;
#endif
#ifdef XFIXES
extern
Bool
noXFixesExtension
;
#endif
...
...
@@ -243,9 +240,6 @@ extern void SecurityExtensionInit(INITARGS);
#ifdef XF86BIGFONT
extern
void
XFree86BigfontExtensionInit
(
INITARGS
);
#endif
#ifdef XF86MISC
extern
void
XFree86MiscExtensionInit
(
INITARGS
);
#endif
#ifdef XFreeXDGA
extern
void
XFree86DGAExtensionInit
(
INITARGS
);
#endif
...
...
@@ -357,9 +351,6 @@ static ExtensionToggle ExtensionToggleList[] =
#ifdef XF86DRI
{
"XFree86-DRI"
,
&
noXFree86DRIExtension
},
#endif
#ifdef XF86MISC
{
"XFree86-Misc"
,
&
noXFree86MiscExtension
},
#endif
#ifdef XFIXES
{
"XFIXES"
,
&
noXFixesExtension
},
#endif
...
...
@@ -475,9 +466,6 @@ InitExtensions(argc, argv)
if
(
!
noXFree86BigfontExtension
)
XFree86BigfontExtensionInit
();
#endif
#if !defined(PRINT_ONLY_SERVER) && !defined(NO_HW_ONLY_EXTS)
#if defined(XF86MISC)
if
(
!
noXFree86MiscExtension
)
XFree86MiscExtensionInit
();
#endif
#if defined(XFreeXDGA)
if
(
!
noXFree86DGAExtension
)
XFree86DGAExtensionInit
();
#endif
...
...
nx-X11/programs/Xserver/os/utils.c
View file @
2ff2c92b
...
...
@@ -204,9 +204,6 @@ Bool noXFree86BigfontExtension = FALSE;
#ifdef XF86DRI
Bool
noXFree86DRIExtension
=
FALSE
;
#endif
#ifdef XF86MISC
Bool
noXFree86MiscExtension
=
FALSE
;
#endif
#ifdef XFIXES
Bool
noXFixesExtension
=
FALSE
;
#endif
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment