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

[Julien Cristau]

On Tue, May 18, 2010 at 14:58:15 +1000, Peter Hutterer wrote:

> 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>
> 
Looks like this was never applied.  Keith, can you take it, or should I
resend?  It's at http://patchwork.freedesktop.org/patch/645/

Thanks,
Julien

> > ---
> >  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
> 
> 
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel
>