Hi Nicolai, On 30 June 2017 at 13:45, Nicolai Hähnle <nhaeh...@gmail.com> wrote: > From: Nicolai Hähnle <nicolai.haeh...@amd.com> > > --- > src/mesa/drivers/dri/common/xmlconfig.c | 10 ++++------ > 1 file changed, 4 insertions(+), 6 deletions(-) > > diff --git a/src/mesa/drivers/dri/common/xmlconfig.c > b/src/mesa/drivers/dri/common/xmlconfig.c > index d464937..9bd587b 100644 > --- a/src/mesa/drivers/dri/common/xmlconfig.c > +++ b/src/mesa/drivers/dri/common/xmlconfig.c > @@ -29,22 +29,20 @@ > > #include <stdarg.h> > #include <stdio.h> > #include <string.h> > #include <assert.h> > #include <expat.h> > #include <fcntl.h> > #include <math.h> > #include <unistd.h> > #include <errno.h> > -#include "main/imports.h" With this one (in particular) gone, I think that one can drop the mesa/ and mapi/ includes from the build. Might want to do that after the move, if you have a minute.
> -#include "utils.h" > #include "xmlconfig.h" > > #undef GET_PROGRAM_NAME > > #if (defined(__GNU_LIBRARY__) || defined(__GLIBC__)) && !defined(__UCLIBC__) > # if !defined(__GLIBC__) || (__GLIBC__ < 2) > /* These aren't declared in any libc5 header */ > extern char *program_invocation_name, *program_invocation_short_name; > # endif > # define GET_PROGRAM_NAME() program_invocation_short_name > @@ -325,21 +323,21 @@ parseValue(driOptionValue *v, driOptionType type, const > XML_Char *string) > case DRI_ENUM: /* enum is just a special integer */ > case DRI_INT: > v->_int = strToI (string, &tail, 0); > break; > case DRI_FLOAT: > v->_float = strToF (string, &tail); > break; > case DRI_STRING: > free (v->_string); > v->_string = strndup(string, STRING_CONF_MAXLEN); > - return GL_TRUE; > + return true; These kind of changes did byte us in the past - see 8392179fcc10024e3d80d6adedb38c30fd3cacc7 I think it matters too much here, but we'd want "return 1". Please skim through the commit just in case. Thanks Emil _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
