summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2009-05-28 15:32:03 -0400
committerAdam Jackson <ajax@redhat.com>2009-05-28 15:32:03 -0400
commit71a83d68ab07536c0778d13cd7da974c40e77457 (patch)
tree232064dfcf482fc3fb45062a0812a137015a2781
parent2107becb0ce2ffda001be65728c53563496d8d50 (diff)
xfree86: Remove loader symbol list ABI stubs
These have been nops since 2006 and functionally void since 7.0.
-rw-r--r--hw/xfree86/common/xf86.h4
-rw-r--r--hw/xfree86/common/xf86Helper.c22
-rw-r--r--hw/xfree86/common/xf86Module.h4
-rw-r--r--hw/xfree86/loader/loader.c21
4 files changed, 0 insertions, 51 deletions
diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h
index cb05cb36b..e49f28db0 100644
--- a/hw/xfree86/common/xf86.h
+++ b/hw/xfree86/common/xf86.h
@@ -277,10 +277,6 @@ extern _X_EXPORT pointer xf86LoadSubModule(ScrnInfoPtr pScrn, const char *name);
extern _X_EXPORT pointer xf86LoadOneModule(char *name, pointer optlist);
extern _X_EXPORT void xf86UnloadSubModule(pointer mod);
extern _X_EXPORT Bool xf86LoaderCheckSymbol(const char *name);
-extern _X_EXPORT void xf86LoaderReqSymLists(const char **, ...);
-extern _X_EXPORT void xf86LoaderReqSymbols(const char *, ...);
-extern _X_EXPORT void xf86LoaderRefSymLists(const char **, ...);
-extern _X_EXPORT void xf86LoaderRefSymbols(const char *, ...);
extern _X_EXPORT void xf86SetBackingStore(ScreenPtr pScreen);
extern _X_EXPORT void xf86SetSilkenMouse(ScreenPtr pScreen);
extern _X_EXPORT pointer xf86FindXvOptions(int scrnIndex, int adapt_index, char *port_name,
diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c
index 37802d61a..eac819b9c 100644
--- a/hw/xfree86/common/xf86Helper.c
+++ b/hw/xfree86/common/xf86Helper.c
@@ -2290,28 +2290,6 @@ xf86LoaderCheckSymbol(const char *name)
return LoaderSymbol(name) != NULL;
}
-/* These two are just ABI stubs, they don't do anything in dlloader world */
-void
-xf86LoaderReqSymLists(const char **list0, ...)
-{
-}
-
-void
-xf86LoaderReqSymbols(const char *sym0, ...)
-{
-}
-
-void
-xf86LoaderRefSymLists(const char **list0, ...)
-{
-}
-
-void
-xf86LoaderRefSymbols(const char *sym0, ...)
-{
-}
-
-
typedef enum {
OPTION_BACKING_STORE
} BSOpts;
diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h
index cbba3edde..9ecffb7cd 100644
--- a/hw/xfree86/common/xf86Module.h
+++ b/hw/xfree86/common/xf86Module.h
@@ -194,10 +194,6 @@ extern _X_EXPORT char **LoaderListDirs(const char **, const char **);
extern _X_EXPORT void LoaderFreeDirList(char **);
extern _X_EXPORT void LoaderErrorMsg(const char *, const char *, int, int);
extern _X_EXPORT void LoadExtension(ExtensionModule *, Bool);
-extern _X_EXPORT void LoaderRefSymLists(const char **, ...);
-extern _X_EXPORT void LoaderRefSymbols(const char *, ...);
-extern _X_EXPORT void LoaderReqSymLists(const char **, ...);
-extern _X_EXPORT void LoaderReqSymbols(const char *, ...);
extern _X_EXPORT int LoaderCheckUnresolved(int);
extern _X_EXPORT void LoaderGetOS(const char **name, int *major, int *minor, int *teeny);
extern _X_EXPORT Bool LoaderShouldIgnoreABI(void);
diff --git a/hw/xfree86/loader/loader.c b/hw/xfree86/loader/loader.c
index 1803d0eb1..47c8c2e7f 100644
--- a/hw/xfree86/loader/loader.c
+++ b/hw/xfree86/loader/loader.c
@@ -159,27 +159,6 @@ LoaderInit(void)
#endif
}
-/* These four are just ABI stubs */
-void
-LoaderRefSymbols(const char *sym0, ...)
-{
-}
-
-void
-LoaderRefSymLists(const char **list0, ...)
-{
-}
-
-void
-LoaderReqSymLists(const char **list0, ...)
-{
-}
-
-void
-LoaderReqSymbols(const char *sym0, ...)
-{
-}
-
/* Public Interface to the loader. */
int