From c54a9ca152898ec2ffe50f6d5b70d483b85c1c34 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 14 Apr 2016 11:17:22 -0400 Subject: [PATCH] loader: Move loader list details to internal header There's no reason a driver should ever care about this. Reviewed-by: Eric Anholt Reviewed-by: Julien Cristau Signed-off-by: Adam Jackson --- hw/xfree86/common/xf86Config.c | 2 +- hw/xfree86/common/xf86Configure.c | 1 + hw/xfree86/common/xf86Module.h | 2 -- hw/xfree86/loader/loaderProcs.h | 3 +++ 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c index 21daf1a0f..3a8f0e1f9 100644 --- a/hw/xfree86/common/xf86Config.c +++ b/hw/xfree86/common/xf86Config.c @@ -60,8 +60,8 @@ #include "globals.h" #include "extension.h" #include "xf86pciBus.h" - #include "xf86Xinput.h" +#include "loaderProcs.h" #include "xkbsrv.h" diff --git a/hw/xfree86/common/xf86Configure.c b/hw/xfree86/common/xf86Configure.c index 0d7a1270c..e5889b4b5 100644 --- a/hw/xfree86/common/xf86Configure.c +++ b/hw/xfree86/common/xf86Configure.c @@ -40,6 +40,7 @@ #include "xf86Sbus.h" #endif #include "misc.h" +#include "loaderProcs.h" typedef struct _DevToConfig { GDevRec GDev; diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h index faea07f74..a3b2c932b 100644 --- a/hw/xfree86/common/xf86Module.h +++ b/hw/xfree86/common/xf86Module.h @@ -156,8 +156,6 @@ extern _X_EXPORT void *LoadSubModule(void *, const char *, const char **, extern _X_EXPORT void UnloadSubModule(void *); extern _X_EXPORT void UnloadModule(void *); extern _X_EXPORT void *LoaderSymbol(const char *); -extern _X_EXPORT const 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 Bool LoaderShouldIgnoreABI(void); extern _X_EXPORT int LoaderGetABIVersion(const char *abiclass); diff --git a/hw/xfree86/loader/loaderProcs.h b/hw/xfree86/loader/loaderProcs.h index ee8a5578e..eee9a27c0 100644 --- a/hw/xfree86/loader/loaderProcs.h +++ b/hw/xfree86/loader/loaderProcs.h @@ -85,6 +85,9 @@ unsigned long LoaderGetModuleVersion(ModuleDescPtr mod); void LoaderResetOptions(void); void LoaderSetOptions(unsigned long); +const char **LoaderListDirs(const char **, const char **); +void LoaderFreeDirList(char **); + /* Options for LoaderSetOptions */ #define LDR_OPT_ABI_MISMATCH_NONFATAL 0x0001