[PATCH] xfree86: remove some 'enable this later' and if 0 ifdefs

[Dave Airlie]

On Tue, 2009-12-22 at 15:40 +1000, Peter Hutterer wrote:
> 2003 called, they want their ifdefs back.
> 

Reviewed-by: Dave Airlie <airlied at redhat.com>

> Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
> ---
>  hw/xfree86/parser/Input.c  |    7 -------
>  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 4e3c04e..8c8e46f 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 d548cd2..beb008b 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;