[PATCH 06/37] Loader: Drop EXTERN_MODULE flag

[Daniel Stone]

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 at fooishbar.org>
---
 hw/xfree86/common/xf86Module.h |    3 ---
 hw/xfree86/doc/ddxDesign.xml   |    9 ---------
 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 599f25f..655a256 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 0290960..87666b1 100644
--- a/hw/xfree86/doc/ddxDesign.xml
+++ b/hw/xfree86/doc/ddxDesign.xml
@@ -5375,15 +5375,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 9f82099..8ee01f2 100644
--- a/hw/xfree86/loader/loadmod.c
+++ b/hw/xfree86/loader/loadmod.c
@@ -973,10 +973,6 @@ doLoadModule(const char *module, const char *path, const char **subdirlist,
 	    ret->TearDownProc = teardown;
 	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);
-- 
1.7.5.4