| Message ID | 1274117994-20778-1-git-send-email-jcristau@debian.org |
|---|---|
| State | Accepted, archived |
| Commit | 69e8e1b0b95a325da3e3a2d76d092e7131baa9ad |
| Headers | show |
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>
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@debian.org> Acked-by: Peter Hutterer <peter.hutterer@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
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@debian.org> > > Acked-by: Peter Hutterer <peter.hutterer@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@lists.x.org: X.Org development > Archives: http://lists.x.org/archives/xorg-devel > Info: http://lists.x.org/mailman/listinfo/xorg-devel >
On Wed, Nov 10, 2010 at 01:36:50PM +0100, Julien Cristau wrote: > 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@debian.org> > > > > Acked-by: Peter Hutterer <peter.hutterer@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 for the reminder. I've merged it into my tree, I have another pull request building up anyway, will be out once keith starts pulling again (hint hint, nudge nudge). Cheers, Peter > > > --- > > > 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
On Thu, 11 Nov 2010 08:42:50 +1000, Peter Hutterer <peter.hutterer@who-t.net> wrote: > Thanks for the reminder. I've merged it into my tree, I have another pull > request building up anyway, will be out once keith starts pulling again > (hint hint, nudge nudge). Sorry for the delay; I went to two conferences last week. Peter -- I'll wait for your pull request.
os/strlc{at,py}.c were trying to include xorg-config.h, which is not available in dix. Signed-off-by: Julien Cristau <jcristau@debian.org> --- os/strlcat.c | 4 ++-- os/strlcpy.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)