summaryrefslogtreecommitdiff
path: root/hw/xfree86/loader/loadmod.c
diff options
context:
space:
mode:
authorPaulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>2008-12-03 05:43:34 -0200
committerPaulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>2008-12-03 05:43:34 -0200
commit49f77fff1495c0a2050fb18f9b1fc627839bbfc2 (patch)
treeeebaec908150abfc0159d9ee941404918f553113 /hw/xfree86/loader/loadmod.c
parent0b8f8b24f718820a72ebdc52423c2e6a44e848c5 (diff)
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source files. Instead, it should be used in headers, and the proper C source include that header. Some special cases are symbols that need to be shared between modules, but not expected to be used by external drivers, and symbols that are accessible via LoaderSymbol/dlopen. This patch also adds conditionally some new sdk header files, depending on extensions enabled. These files were added to match pattern for other extensions/modules, that is, have the headers "deciding" symbol visibility in the sdk. These headers are: o Xext/panoramiXsrv.h, Xext/panoramiX.h o fbpict.h (unconditionally) o vidmodeproc.h o mioverlay.h (unconditionally, used only by xaa) o xfixes.h (unconditionally, symbols required by dri2) LoaderSymbol and similar functions now don't have different prototypes, in loaderProcs.h and xf86Module.h, so that both headers can be included, without the need of defining IN_LOADER. xf86NewInputDevice() device prototype readded to xf86Xinput.h, but not exported (and with a comment about it).
Diffstat (limited to 'hw/xfree86/loader/loadmod.c')
-rw-r--r--hw/xfree86/loader/loadmod.c25
1 files changed, 14 insertions, 11 deletions
diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c
index 2324e78a9..3f754934e 100644
--- a/hw/xfree86/loader/loadmod.c
+++ b/hw/xfree86/loader/loadmod.c
@@ -469,7 +469,7 @@ FindModule(const char *module, const char *dirname, const char **subdirlist,
return name;
}
-_X_EXPORT char **
+char **
LoaderListDirs(const char **subdirlist, const char **patternlist)
{
char buf[PATH_MAX + 1];
@@ -563,7 +563,7 @@ LoaderListDirs(const char **subdirlist, const char **patternlist)
return listing;
}
-_X_EXPORT void
+void
LoaderFreeDirList(char **list)
{
FreeStringList(list);
@@ -745,13 +745,14 @@ AddSibling(ModuleDescPtr head, ModuleDescPtr new)
return (new);
}
-_X_EXPORT ModuleDescPtr
-LoadSubModule(ModuleDescPtr parent, const char *module,
+pointer
+LoadSubModule(pointer _parent, const char *module,
const char **subdirlist, const char **patternlist,
pointer options, const XF86ModReqInfo * modreq,
int *errmaj, int *errmin)
{
ModuleDescPtr submod;
+ ModuleDescPtr parent = (ModuleDescPtr)_parent;
xf86MsgVerb(X_INFO, 3, "Loading sub module \"%s\"\n", module);
@@ -794,7 +795,7 @@ NewModuleDesc(const char *name)
return (mdp);
}
-_X_EXPORT ModuleDescPtr
+ModuleDescPtr
DuplicateModule(ModuleDescPtr mod, ModuleDescPtr parent)
{
ModuleDescPtr ret;
@@ -1080,10 +1081,10 @@ LoadModule(const char *module, const char *path, const char **subdirlist,
modreq, errmaj, errmin, LD_FLAG_GLOBAL);
}
-_X_EXPORT void
-UnloadModule(ModuleDescPtr mod)
+void
+UnloadModule(pointer mod)
{
- UnloadModuleOrDriver(mod);
+ UnloadModuleOrDriver((ModuleDescPtr)mod);
}
static void
@@ -1112,9 +1113,11 @@ UnloadModuleOrDriver(ModuleDescPtr mod)
#endif
}
-_X_EXPORT void
-UnloadSubModule(ModuleDescPtr mod)
+void
+UnloadSubModule(pointer _mod)
{
+ ModuleDescPtr mod = (ModuleDescPtr)_mod;
+
if (mod == NULL || mod->name == NULL)
return;
@@ -1160,7 +1163,7 @@ RemoveChild(ModuleDescPtr child)
return;
}
-_X_EXPORT void
+void
LoaderErrorMsg(const char *name, const char *modname, int errmaj, int errmin)
{
const char *msg;