summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter@cs.unisa.edu.au>2008-06-29 20:05:27 +0930
committerPeter Hutterer <peter.hutterer@who-t.net>2008-07-03 22:49:46 +0930
commit6674b87a7dca7d6ffd9dd9af888c5256b13d7877 (patch)
treedfc43daadab10ba81bb678699df3f90736b85e20
parent1e96782011f0b4ba6ed1d3d3df118964a58d15fd (diff)
xfree86: move declaration of configured_device to start of function.
Last I checked C doesn't allow declarations halfway down a block.
-rw-r--r--hw/xfree86/common/xf86Init.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 46c4a96b8..5418ca0ff 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -472,6 +472,7 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
MessageType pix24From = X_DEFAULT;
Bool pix24Fail = FALSE;
Bool autoconfig = FALSE;
+ GDevPtr configured_device;
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 */
/* FIXME: Does not handle multiple active screen sections, but I'm not
* 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 (!autoConfigDevice(configured_device)) {
xf86Msg(X_ERROR, "Automatic driver configuration failed\n");