frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Loader: Drop EXTERN_MODULE flag 

EXTERN_MODULE was used to specify that we shouldn't worry about modules
lacking a ModuleData object.  It was also completely unused.  *shrug*

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Daniel Stone 2012-07-10 02:02:57 +01:00 committed by Keith Packard
parent a1d41e311c
commit 4170e4e1f8
3 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/xfree86/common/xf86Module.h
View File

@ -55,9 +55,6 @@ typedef enum {
#define DEFAULT_LIST ((char *)-1) #define DEFAULT_LIST ((char *)-1)
/* This indicates a special module that doesn't have the usual entry point */
#define EXTERN_MODULE ((pointer)-1)
/* Built-in ABI classes. These definitions must not be changed. */ /* Built-in ABI classes. These definitions must not be changed. */
#define ABI_CLASS_NONE NULL #define ABI_CLASS_NONE NULL
#define ABI_CLASS_ANSIC "X.Org ANSI C Emulation" #define ABI_CLASS_ANSIC "X.Org ANSI C Emulation"

9
hw/xfree86/doc/ddxDesign.xml
View File

@ -5363,15 +5363,6 @@ XFree86 common layer.
way by modules loaded directly by the XFree86 common way by modules loaded directly by the XFree86 common
layer. However, it may be used for application-specific layer. However, it may be used for application-specific
parameter passing in other situations. parameter passing in other situations.
</para>
<para>
When loading <quote>external</quote> modules (modules that don't
have the standard entry point, for example a
special shared library) the options parameter can be
set to <constant>EXTERN_MODULE</constant> to tell the
loader not to reject the module when it doesn't find
the standard entry point.
</para></listitem></varlistentry> </para></listitem></varlistentry>

4
hw/xfree86/loader/loadmod.c
View File

@ -992,10 +992,6 @@ doLoadModule(const char *module, const char *path, const char **subdirlist,
ret->VersionInfo = vers; ret->VersionInfo = vers;
} }
else { else {
/* No initdata is OK for external modules */
if (options == EXTERN_MODULE)
goto LoadModule_exit;
/* no initdata, fail the load */ /* no initdata, fail the load */
xf86Msg(X_ERROR, "LoadModule: Module %s does not have a %s " xf86Msg(X_ERROR, "LoadModule: Module %s does not have a %s "
"data object.\n", module, p); "data object.\n", module, p);