diff options
| author | Matthieu Herrb <matthieu.herrb@laas.fr> | 2004-11-11 15:44:31 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu.herrb@laas.fr> | 2004-11-11 15:44:31 +0000 |
| commit | e380fd548ed5452d08184723145dd992ad72288c (patch) | |
| tree | bbebd7eae37594ce1057522b12147ca0d43afe5a /hw/xfree86/utils/xorgcfg/interface.c | |
| parent | d7f46f71d892768ea85552a0d5458b69b561fe21 (diff) | |
update shared lib revisions on OpenBSD (Bug #1828).
update references to xf86site.def in comments (Bug #1827).
fix kbd driver for wskbd protocol and pure wscons console driver (Bug
#1825).
don't add '-4' to generated default file name (bug #1826).
typo in resource name (XFree86 bug #1300, X.org bug #1825)
Diffstat (limited to 'hw/xfree86/utils/xorgcfg/interface.c')
| -rw-r--r-- | hw/xfree86/utils/xorgcfg/interface.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/xfree86/utils/xorgcfg/interface.c b/hw/xfree86/utils/xorgcfg/interface.c index 2595fd376..c05ea2605 100644 --- a/hw/xfree86/utils/xorgcfg/interface.c +++ b/hw/xfree86/utils/xorgcfg/interface.c @@ -300,7 +300,7 @@ main(int argc, char *argv[]) startedx = startx(); if (XF86Config_path == NULL) - XF86Config_path = XtNewString(__XCONFIGFILE__"-4"); + XF86Config_path = XtNewString(__XCONFIGFILE__); if (XkbConfig_path == NULL) { XmuSnprintf(XkbConfig_path_static, sizeof(XkbConfig_path_static), "%s/%s%s", XFree86Dir, XkbConfigDir, XkbConfigFile); @@ -536,9 +536,9 @@ main(int argc, char *argv[]) # endif #else # ifdef XF86CONFIGDIR - XF86Config_path = XtNewString(XF86CONFIGDIR "/"__XCONFIGFILE__"-4"); + XF86Config_path = XtNewString(XF86CONFIGDIR "/"__XCONFIGFILE__); # else - XF86Config_path = XtNewString("/etc/X11/"__XCONFIGFILE__"-4"); + XF86Config_path = XtNewString("/etc/X11/"__XCONFIGFILE__); # endif #endif } |