[PATCH] os: include dix-config.h, not xorg-config.h

Peter Hutterer peter.hutterer at who-t.net
Mon May 17 21:58:15 PDT 2010


On Mon, May 17, 2010 at 07:39:54PM +0200, Julien Cristau wrote:
> os/strlc{at,py}.c were trying to include xorg-config.h, which is not
> available in dix.
> 
> Signed-off-by: Julien Cristau <jcristau at debian.org>

Acked-by: Peter Hutterer <peter.hutterer at who-t.net>

> ---
>  os/strlcat.c |    4 ++--
>  os/strlcpy.c |    4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/os/strlcat.c b/os/strlcat.c
> index 91ceabb..7d53b0a 100644
> --- a/os/strlcat.c
> +++ b/os/strlcat.c
> @@ -15,8 +15,8 @@
>   */
>  
>  
> -#ifdef HAVE_XORG_CONFIG_H
> -#include <xorg-config.h>
> +#ifdef HAVE_DIX_CONFIG_H
> +#include <dix-config.h>
>  #endif
>  
>  #include <sys/types.h>
> diff --git a/os/strlcpy.c b/os/strlcpy.c
> index aa9d042..89b6e2e 100644
> --- a/os/strlcpy.c
> +++ b/os/strlcpy.c
> @@ -14,8 +14,8 @@
>   * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
>   */
>  
> -#ifdef HAVE_XORG_CONFIG_H
> -#include <xorg-config.h>
> +#ifdef HAVE_DIX_CONFIG_H
> +#include <dix-config.h>
>  #endif
>  
>  #include <sys/types.h>
> -- 
> 1.7.1




More information about the xorg-devel mailing list