diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2012-07-10 02:02:57 +0100 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-07-09 23:06:41 -0700 |
| commit | 4170e4e1f8e879394c896c490d9f08a38ecfdefd (patch) | |
| tree | 6d0d4994d3956b176ff17507a5c15a15d01cb7a9 | |
| parent | a1d41e311c21eb6627caa0d168e070ceaf90806f (diff) | |
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>
| -rw-r--r-- | hw/xfree86/common/xf86Module.h | 3 | ||||
| -rw-r--r-- | hw/xfree86/doc/ddxDesign.xml | 9 | ||||
| -rw-r--r-- | hw/xfree86/loader/loadmod.c | 4 |
3 files changed, 0 insertions, 16 deletions
diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h index 9ba874c4b..c48f041d1 100644 --- a/hw/xfree86/common/xf86Module.h +++ b/hw/xfree86/common/xf86Module.h @@ -55,9 +55,6 @@ typedef enum { #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. */ #define ABI_CLASS_NONE NULL #define ABI_CLASS_ANSIC "X.Org ANSI C Emulation" diff --git a/hw/xfree86/doc/ddxDesign.xml b/hw/xfree86/doc/ddxDesign.xml index 24b0c0324..118b58f95 100644 --- a/hw/xfree86/doc/ddxDesign.xml +++ b/hw/xfree86/doc/ddxDesign.xml @@ -5363,15 +5363,6 @@ XFree86 common layer. way by modules loaded directly by the XFree86 common layer. However, it may be used for application-specific 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> diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c index dd2057318..e7e60dd56 100644 --- a/hw/xfree86/loader/loadmod.c +++ b/hw/xfree86/loader/loadmod.c @@ -992,10 +992,6 @@ doLoadModule(const char *module, const char *path, const char **subdirlist, ret->VersionInfo = vers; } else { - /* No initdata is OK for external modules */ - if (options == EXTERN_MODULE) - goto LoadModule_exit; - /* no initdata, fail the load */ xf86Msg(X_ERROR, "LoadModule: Module %s does not have a %s " "data object.\n", module, p); |