diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-12-22 15:40:40 +1000 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2009-12-22 21:27:54 -0800 |
| commit | 38b5afb0b5b46b61effa6f0e5a377b343e357e7e (patch) | |
| tree | 61586e89cd643ae49c032f1fd69a747f03154a08 | |
| parent | 7dc78db79edd15b971110acaf16bbe7f69e40bdb (diff) | |
xfree86: remove some 'enable this later' and if 0 ifdefs
2003 called, they want their ifdefs back.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | hw/xfree86/parser/Input.c | 7 | ||||
| -rw-r--r-- | hw/xfree86/parser/Layout.c | 21 |
2 files changed, 0 insertions, 28 deletions
diff --git a/hw/xfree86/parser/Input.c b/hw/xfree86/parser/Input.c index 4e3c04e53..8c8e46fb4 100644 --- a/hw/xfree86/parser/Input.c +++ b/hw/xfree86/parser/Input.c @@ -172,13 +172,6 @@ xf86validateInput (XF86ConfigPtr p) { XF86ConfInputPtr input = p->conf_input_lst; -#if 0 /* Enable this later */ - if (!input) { - xf86validationError ("At least one InputDevice section is required."); - return (FALSE); - } -#endif - while (input) { if (!input->inp_driver) { xf86validationError (UNDEFINED_INPUTDRIVER_MSG, input->inp_identifier); diff --git a/hw/xfree86/parser/Layout.c b/hw/xfree86/parser/Layout.c index d548cd210..beb008b35 100644 --- a/hw/xfree86/parser/Layout.c +++ b/hw/xfree86/parser/Layout.c @@ -435,20 +435,6 @@ xf86freeLayoutList (XF86ConfLayoutPtr ptr) } } -#define CheckScreen(str, ptr)\ -if (str[0] != '\0') \ -{ \ -screen = xf86findScreen (str, p->conf_screen_lst); \ -if (!screen) \ -{ \ - xf86validationError (UNDEFINED_SCREEN_MSG, \ - str, layout->lay_identifier); \ - return (FALSE); \ -} \ -else \ - ptr = screen; \ -} - int xf86validateLayout (XF86ConfigPtr p) { @@ -476,13 +462,6 @@ xf86validateLayout (XF86ConfigPtr p) else adj->adj_screen = screen; -#if 0 - CheckScreen (adj->adj_top_str, adj->adj_top); - CheckScreen (adj->adj_bottom_str, adj->adj_bottom); - CheckScreen (adj->adj_left_str, adj->adj_left); - CheckScreen (adj->adj_right_str, adj->adj_right); -#endif - adj = adj->list.next; } iptr = layout->lay_inactive_lst; |