[Mesa-dev] [PATCH] g3dvl/xlib: fix build by changing include order

[Younes Manton]

On Sat, Dec 10, 2011 at 11:13 PM, Tobias Droste <tdroste at gmx.de> wrote:
> fixes the following build error since
> c83fb4d45f2a47042f395271efe6e5489b2c4aee:
>
> /usr/include/strings.h:46:13: error: expected declaration specifiers or
> ‘...’ before numeric constant
> /usr/include/strings.h:46:13: error: conflicting types for ‘memset’
> In file included from
> ../../../../src/gallium/winsys/g3dvl/xlib/xsp_winsys.c:34:0:
> ../../../../src/gallium/auxiliary/util/u_inlines.h: In function
> ‘pipe_buffer_create’:
> ../../../../src/gallium/auxiliary/util/u_inlines.h:189:4: error: too
> many arguments to function ‘memset’
> /usr/include/strings.h:46:13: note: declared here
>
> bzero is defined in X11 as: #define bzero(b,len) memset(b,0,len)
> including strings.h after the X11 header results in preprocessor
> replacing 'bzero' in strings.h and generating unbuildable code.
>
> Signed-off-by: Tobias Droste <tdroste at gmx.de>
> ---
>  src/gallium/winsys/g3dvl/xlib/xsp_winsys.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/gallium/winsys/g3dvl/xlib/xsp_winsys.c b/src/gallium/winsys/g3dvl/xlib/xsp_winsys.c
> index e86d92f..c0c7cde 100644
> --- a/src/gallium/winsys/g3dvl/xlib/xsp_winsys.c
> +++ b/src/gallium/winsys/g3dvl/xlib/xsp_winsys.c
> @@ -25,14 +25,14 @@
>  *
>  **************************************************************************/
>
> -#include <X11/Xlibint.h>
> -
>  #include "pipe/p_state.h"
>
>  #include "util/u_memory.h"
>  #include "util/u_format.h"
>  #include "util/u_inlines.h"
>
> +#include <X11/Xlibint.h>
> +
>  #include "state_tracker/xlib_sw_winsys.h"
>  #include "softpipe/sp_public.h"
>
> --
> 1.7.3.4
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Pushed. Thanks.