xserver: Branch 'master'

[Søren Sandmann Pedersen]

 hw/xfree86/common/xf86Init.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c733660428c0a7c1d11f7bd21e23e1bb934d352e
Author: Søren Sandmann Pedersen <sandmann at redhat.com>
Date:   Fri Jun 19 08:37:18 2009 -0400

    Use pixman_version_string() instead of PIXMAN_VERSION_STRING
    
    Pointed out by Julien Cristau.

diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 543d11c..11f4cf1 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -218,7 +218,7 @@ xf86PrintBanner(void)
 #if defined(BUILDERSTRING)
   ErrorF("%s \n",BUILDERSTRING);
 #endif
-  ErrorF("Current version of pixman: %s\n", PIXMAN_VERSION_STRING);
+  ErrorF("Current version of pixman: %s\n", pixman_version_string());
   ErrorF("\tBefore reporting problems, check "__VENDORDWEBSUPPORT__"\n"
 	 "\tto make sure that you have the latest version.\n");
 }