summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd T. Fries <todd@cvs.openbsd.org>2008-11-04 16:50:51 +0000
committerTodd T. Fries <todd@cvs.openbsd.org>2008-11-04 16:50:51 +0000
commitd52546f2a50bdb6fde29eedd1c9003741012ae31 (patch)
treeeb8fbaeb532a04642b4200450cfcbd9f9bc56a19
parentc66c244ce375b93cf77445449b5fc63f072bdfb8 (diff)
variable declarations at the beginning of the scope; found by sparc (a gcc2 arch)
-rw-r--r--xserver/hw/xfree86/common/xf86Init.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/xserver/hw/xfree86/common/xf86Init.c b/xserver/hw/xfree86/common/xf86Init.c
index f020fbe13..3da8f893b 100644
--- a/xserver/hw/xfree86/common/xf86Init.c
+++ b/xserver/hw/xfree86/common/xf86Init.c
@@ -484,6 +484,7 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
xf86Initialising = TRUE;
if (serverGeneration == 1) {
+ GDevPtr configured_device;
pScreenInfo->numScreens = 0;
@@ -563,7 +564,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");