xserver: Branch 'master' - 3 commits

[Julien Cristau]

Hi Søren,

On Thu, Jun 18, 2009 at 09:35:10 -0700, Søren Sandmann Pedersen wrote:

> commit d9b5e77a0e48a16c53653b56bc61a0b8dc4122a1
> Author: Søren Sandmann Pedersen <sandmann at redhat.com>
> Date:   Tue Jun 9 14:36:21 2009 -0400
> 
>     Print the current version of pixman.
> 
> diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
> index c4e5898..543d11c 100644
> --- a/hw/xfree86/common/xf86Init.c
> +++ b/hw/xfree86/common/xf86Init.c
> @@ -218,6 +218,7 @@ xf86PrintBanner(void)
>  #if defined(BUILDERSTRING)
>    ErrorF("%s \n",BUILDERSTRING);
>  #endif
> +  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");
>  }

Wouldn't it be better to use pixman_version_string() here?  The version
used at build time doesn't seem like it should matter.

Cheers,
Julien