xserver: Branch 'master' - 2 commits
Keith Packard
keithp at kemper.freedesktop.org
Thu Feb 24 18:59:35 PST 2011
hw/xfree86/common/xf86sbusBus.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 83861595782aaa05907f9cf7b236d50261d404d9
Merge: a1cc0e5... 4102a00...
Author: Keith Packard <keithp at keithp.com>
Date: Thu Feb 24 18:59:07 2011 -0800
Merge remote branch 'kibi/master'
commit 4102a00962f568b1d34cf72ad524e1cc705b0b1c
Author: Cyril Brulebois <kibi at debian.org>
Date: Wed Feb 23 14:44:23 2011 +0100
xfree86: Fix undefined reference to `XNFsprintf' on sparc.
Build failure on sparc:
| copying selected object files to avoid basename conflicts...
| CCLD Xorg
| ./.libs/libxorg.a(xf86sbusBus.o): In function `xf86SbusConfigureNewDev':
| [â¦]/hw/xfree86/common/xf86sbusBus.c:712: undefined reference to `XNFsprintf'
| collect2: ld returned 1 exit status
Fix typo introduced in:
3a9bb93dd178084f4ff1abcea331ca5a62f88ce6
Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>
Apologized-for-by: Alan Coopersmith <alan.coopersmith at oracle.com>
Signed-off-by: Cyril Brulebois <kibi at debian.org>
diff --git a/hw/xfree86/common/xf86sbusBus.c b/hw/xfree86/common/xf86sbusBus.c
index 8cfac84..181c6ab 100644
--- a/hw/xfree86/common/xf86sbusBus.c
+++ b/hw/xfree86/common/xf86sbusBus.c
@@ -709,6 +709,6 @@ xf86SbusConfigureNewDev(void *busData, sbusDevicePtr sBus, GDevRec *GDev)
XNFasprintf(&GDev->busID, "SBUS:%s", promPath);
free(promPath);
} else {
- XNFsprintf(&GDev->busID, "SBUS:fb%d", sBus->fbNum);
+ XNFasprintf(&GDev->busID, "SBUS:fb%d", sBus->fbNum);
}
}
More information about the xorg-commit
mailing list