xfree86: move declaration of configured_device to start of function.
Last I checked C doesn't allow declarations halfway down a block.
This commit is contained in:
parent
1e96782011
commit
6674b87a7d
|
@ -472,6 +472,7 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
|
||||||
MessageType pix24From = X_DEFAULT;
|
MessageType pix24From = X_DEFAULT;
|
||||||
Bool pix24Fail = FALSE;
|
Bool pix24Fail = FALSE;
|
||||||
Bool autoconfig = FALSE;
|
Bool autoconfig = FALSE;
|
||||||
|
GDevPtr configured_device;
|
||||||
|
|
||||||
xf86Initialising = TRUE;
|
xf86Initialising = TRUE;
|
||||||
|
|
||||||
|
@ -555,7 +556,7 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
|
||||||
/* If there aren't any specified in the config file, autoconfig them */
|
/* If there aren't any specified in the config file, autoconfig them */
|
||||||
/* FIXME: Does not handle multiple active screen sections, but I'm not
|
/* FIXME: Does not handle multiple active screen sections, but I'm not
|
||||||
* sure if we really want to handle that case*/
|
* sure if we really want to handle that case*/
|
||||||
GDevPtr configured_device = xf86ConfigLayout.screens->screen->device;
|
configured_device = xf86ConfigLayout.screens->screen->device;
|
||||||
if ((!configured_device) || (!configured_device->driver)) {
|
if ((!configured_device) || (!configured_device->driver)) {
|
||||||
if (!autoConfigDevice(configured_device)) {
|
if (!autoConfigDevice(configured_device)) {
|
||||||
xf86Msg(X_ERROR, "Automatic driver configuration failed\n");
|
xf86Msg(X_ERROR, "Automatic driver configuration failed\n");
|
||||||
|
|
Loading…
Reference in New Issue
Block a user