diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2008-11-02 15:26:35 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2008-11-02 15:26:35 +0000 |
| commit | dbca69c8a4f3e2d1ccb4f89152213b2861b33af6 (patch) | |
| tree | f8963ef73903a7b4374adc2354dffbaa905112ac /xserver/hw/xwin/winconfig.c | |
| parent | 33b2029f322f3c238b7ba528083195ad8dde33e1 (diff) | |
xserver 1.5.2. tested by ckuethe@, oga@, and others.
Diffstat (limited to 'xserver/hw/xwin/winconfig.c')
| -rw-r--r-- | xserver/hw/xwin/winconfig.c | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/xserver/hw/xwin/winconfig.c b/xserver/hw/xwin/winconfig.c index e3d18083e..38966bf96 100644 --- a/xserver/hw/xwin/winconfig.c +++ b/xserver/hw/xwin/winconfig.c @@ -40,7 +40,7 @@ #ifndef XKB_IN_SERVER #define XKB_IN_SERVER #endif -#include <X11/extensions/XKBsrv.h> +#include <xkbsrv.h> #endif #ifdef XWIN_XF86CONFIG @@ -49,7 +49,6 @@ "/etc/X11/%R," "%P/etc/X11/%R," \ "%E," "%F," \ "/etc/X11/%F," "%P/etc/X11/%F," \ - "%D/%X," \ "/etc/X11/%X-%M," "/etc/X11/%X," "/etc/%X," \ "%P/etc/X11/%X.%H," "%P/etc/X11/%X-%M," \ "%P/etc/X11/%X," \ @@ -65,7 +64,6 @@ WinCmdlineRec g_cmdline = { NULL, /* configFile */ #endif NULL, /* fontPath */ - NULL, /* rgbPath */ #ifdef XWIN_XF86CONFIG NULL, /* keyboard */ #endif @@ -673,20 +671,6 @@ winConfigFiles () } winMsg (from, "FontPath set to \"%s\"\n", defaultFontPath); - /* RGBPath */ - from = X_DEFAULT; - if (g_cmdline.rgbPath) - { - from = X_CMDLINE; - rgbPath = g_cmdline.rgbPath; - } - else if (filesptr != NULL && filesptr->file_rgbpath) - { - from = X_CONFIG; - rgbPath = xstrdup (filesptr->file_rgbpath); - } - winMsg (from, "RgbPath set to \"%s\"\n", rgbPath); - return TRUE; } #else @@ -702,14 +686,6 @@ winConfigFiles () winMsg (X_CMDLINE, "FontPath set to \"%s\"\n", defaultFontPath); } - /* RGBPath */ - if (g_cmdline.rgbPath) - { - from = X_CMDLINE; - rgbPath = g_cmdline.rgbPath; - winMsg (X_CMDLINE, "RgbPath set to \"%s\"\n", rgbPath); - } - return TRUE; } #endif |