diff options
| author | marha <marha@users.sourceforge.net> | 2009-10-21 21:22:47 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-10-21 21:22:47 +0000 |
| commit | e141b55eccf3c69d8ced513992e21463d37dbb03 (patch) | |
| tree | eaeeeda04d5b6ce82d43d04466164b44a74d0951 /xorg-server/hw/dmx/config/dmxconfig.c | |
| parent | d0fe50e45b3a640afa51eb8f45cf7c3a0df0740b (diff) | |
| parent | 1f876171067c04fc21fccd5a3051f982fd85c0f0 (diff) | |
| download | vcxsrv-e141b55eccf3c69d8ced513992e21463d37dbb03.tar.gz vcxsrv-e141b55eccf3c69d8ced513992e21463d37dbb03.tar.bz2 vcxsrv-e141b55eccf3c69d8ced513992e21463d37dbb03.zip | |
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/hw/dmx/config/dmxconfig.c')
| -rw-r--r-- | xorg-server/hw/dmx/config/dmxconfig.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/xorg-server/hw/dmx/config/dmxconfig.c b/xorg-server/hw/dmx/config/dmxconfig.c index 225d89277..a31e5f7f7 100644 --- a/xorg-server/hw/dmx/config/dmxconfig.c +++ b/xorg-server/hw/dmx/config/dmxconfig.c @@ -490,9 +490,8 @@ void dmxConfigSetMaxScreens(void) return (char *)(dmx##glob ? dmx##glob : def); \ } -GEN(rules, XkbRules, DMX_DEFAULT_XKB_RULES) -GEN(model, XkbModel, DMX_DEFAULT_XKB_MODEL) -GEN(layout, XkbLayout, DMX_DEFAULT_XKB_LAYOUT) -GEN(variant, XkbVariant, DMX_DEFAULT_XKB_VARIANT) -GEN(options, XkbOptions, DMX_DEFAULT_XKB_OPTIONS) - +GEN(rules, XkbRules, XKB_DFLT_RULES) +GEN(model, XkbModel, XKB_DFLT_MODEL) +GEN(layout, XkbLayout, XKB_DFLT_LAYOUT) +GEN(variant, XkbVariant, XKB_DFLT_VARIANT) +GEN(options, XkbOptions, XKB_DFLT_OPTIONS) |