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

loader: Move loader list details to internal header 

There's no reason a driver should ever care about this.

Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Adam Jackson 2016-04-14 11:17:22 -04:00
parent d55284e863
commit c54a9ca152
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xfree86/common/xf86Config.c
View File

@ -60,8 +60,8 @@
#include "globals.h" #include "globals.h"
#include "extension.h" #include "extension.h"
#include "xf86pciBus.h" #include "xf86pciBus.h"
#include "xf86Xinput.h" #include "xf86Xinput.h"
#include "loaderProcs.h"
#include "xkbsrv.h" #include "xkbsrv.h"

1
hw/xfree86/common/xf86Configure.c
View File

@ -40,6 +40,7 @@
#include "xf86Sbus.h" #include "xf86Sbus.h"
#endif #endif
#include "misc.h" #include "misc.h"
#include "loaderProcs.h"
typedef struct _DevToConfig { typedef struct _DevToConfig {
GDevRec GDev; GDevRec GDev;

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

@ -156,8 +156,6 @@ extern _X_EXPORT void *LoadSubModule(void *, const char *, const char **,
extern _X_EXPORT void UnloadSubModule(void *); extern _X_EXPORT void UnloadSubModule(void *);
extern _X_EXPORT void UnloadModule(void *); extern _X_EXPORT void UnloadModule(void *);
extern _X_EXPORT void *LoaderSymbol(const char *); 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 void LoaderErrorMsg(const char *, const char *, int, int);
extern _X_EXPORT Bool LoaderShouldIgnoreABI(void); extern _X_EXPORT Bool LoaderShouldIgnoreABI(void);
extern _X_EXPORT int LoaderGetABIVersion(const char *abiclass); extern _X_EXPORT int LoaderGetABIVersion(const char *abiclass);

3
hw/xfree86/loader/loaderProcs.h
View File

@ -85,6 +85,9 @@ unsigned long LoaderGetModuleVersion(ModuleDescPtr mod);
void LoaderResetOptions(void); void LoaderResetOptions(void);
void LoaderSetOptions(unsigned long); void LoaderSetOptions(unsigned long);
const char **LoaderListDirs(const char **, const char **);
void LoaderFreeDirList(char **);
/* Options for LoaderSetOptions */ /* Options for LoaderSetOptions */
#define LDR_OPT_ABI_MISMATCH_NONFATAL 0x0001 #define LDR_OPT_ABI_MISMATCH_NONFATAL 0x0001