diff options
| author | marha <marha@users.sourceforge.net> | 2012-07-04 10:41:31 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-07-04 10:41:31 +0200 |
| commit | b3daaeb1467f3d3d52bef2f76413f3a063fc4f33 (patch) | |
| tree | 4415e903a15dff8b36bba9fcce197d26a7790186 /xorg-server/hw/xfree86/loader/loadmod.c | |
| parent | e44d0067ca65d58f258e7f2ae1a240c9bfce5766 (diff) | |
| parent | fc8f37239f3af088819c18f5632b2608954af73a (diff) | |
| download | vcxsrv-b3daaeb1467f3d3d52bef2f76413f3a063fc4f33.tar.gz vcxsrv-b3daaeb1467f3d3d52bef2f76413f3a063fc4f33.tar.bz2 vcxsrv-b3daaeb1467f3d3d52bef2f76413f3a063fc4f33.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/include/misc.h
xorg-server/os/utils.c
Diffstat (limited to 'xorg-server/hw/xfree86/loader/loadmod.c')
| -rw-r--r-- | xorg-server/hw/xfree86/loader/loadmod.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/xorg-server/hw/xfree86/loader/loadmod.c b/xorg-server/hw/xfree86/loader/loadmod.c index 706b9b3e8..72020a58c 100644 --- a/xorg-server/hw/xfree86/loader/loadmod.c +++ b/xorg-server/hw/xfree86/loader/loadmod.c @@ -1093,9 +1093,10 @@ UnloadModuleOrDriver(ModuleDescPtr mod) return; if (mod->parent) - xf86MsgVerb(X_INFO, 3, "UnloadSubModule: \"%s\"\n", mod->name); + LogMessageVerbSigSafe(X_INFO, 3, "UnloadSubModule: \"%s\"\n", + mod->name); else - xf86MsgVerb(X_INFO, 3, "UnloadModule: \"%s\"\n", mod->name); + LogMessageVerbSigSafe(X_INFO, 3, "UnloadModule: \"%s\"\n", mod->name); if (mod->TearDownData != ModuleDuplicated) { if ((mod->TearDownProc) && (mod->TearDownData)) |