frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Peter Hutterer 2009-12-22 15:40:40 +10:00 committed by Keith Packard
parent 7dc78db79e
commit 38b5afb0b5
2 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/xfree86/parser/Input.c
View File

@ -172,13 +172,6 @@ xf86validateInput (XF86ConfigPtr p)
{ {
XF86ConfInputPtr input = p->conf_input_lst; 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) { while (input) {
if (!input->inp_driver) { if (!input->inp_driver) {
xf86validationError (UNDEFINED_INPUTDRIVER_MSG, input->inp_identifier); xf86validationError (UNDEFINED_INPUTDRIVER_MSG, input->inp_identifier);

21
hw/xfree86/parser/Layout.c
View File

@ -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 int
xf86validateLayout (XF86ConfigPtr p) xf86validateLayout (XF86ConfigPtr p)
{ {
@ -476,13 +462,6 @@ xf86validateLayout (XF86ConfigPtr p)
else else
adj->adj_screen = screen; 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; adj = adj->list.next;
} }
iptr = layout->lay_inactive_lst; iptr = layout->lay_inactive_lst;