equal
deleted
inserted
replaced
1 Provide old #define for code not yet converted to the new ones set in |
1 Provide old #define for code not yet converted to the new ones set in |
2 xkb-defaults.patch (like the xorgcfg & xorgconfig code that isn't in 1.6). |
2 xkb-defaults.patch (like the xorgcfg & xorgconfig code that isn't in 1.6). |
3 |
3 |
4 --- include/xkb-config.h.in Sun Jan 11 20:09:47 2009 |
4 diff -urp -x '*~' -x '*.orig' include/xkb-config.h.in include/xkb-config.h.in |
5 +++ include/xkb-config.h.in Mon Jan 12 08:48:16 2009 |
5 --- include/xkb-config.h.in 2009-01-22 20:32:43.368859000 -0800 |
|
6 +++ include/xkb-config.h.in 2009-01-22 20:32:51.502769000 -0800 |
6 @@ -7,6 +7,7 @@ |
7 @@ -7,6 +7,7 @@ |
7 |
8 |
8 /* Default set of XKB rules. */ |
9 /* Default set of XKB rules. */ |
9 #undef XKB_DFLT_RULES |
10 #undef XKB_DFLT_RULES |
10 +#define __XKBDEFRULES__ XKB_DFLT_RULES |
11 +#define __XKBDEFRULES__ XKB_DFLT_RULES |
11 |
12 |
12 /* Default XKB model. */ |
13 /* Default XKB model. */ |
13 #undef XKB_DFLT_MODEL |
14 #undef XKB_DFLT_MODEL |
14 |
15 diff -urp -x '*~' -x '*.orig' include/xorg-server.h.in include/xorg-server.h.in |
15 --- include/xorg-server.h.in Wed Nov 5 08:52:17 2008 |
16 --- include/xorg-server.h.in 2009-01-22 20:32:43.369262000 -0800 |
16 +++ include/xorg-server.h.in Mon Jan 12 20:37:24 2009 |
17 +++ include/xorg-server.h.in 2009-01-22 20:32:51.503745000 -0800 |
17 @@ -135,6 +135,7 @@ |
18 @@ -108,6 +108,7 @@ |
18 |
19 |
19 /* XKB default rules */ |
20 /* XKB default rules */ |
20 #undef XKB_DFLT_RULES |
21 #undef XKB_DFLT_RULES |
21 +#define __XKBDEFRULES__ XKB_DFLT_RULES |
22 +#define __XKBDEFRULES__ XKB_DFLT_RULES |
22 |
23 |