summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTobias Droste <[email protected]>2011-12-11 05:13:47 +0100
committerYounes Manton <[email protected]>2011-12-11 01:03:20 -0500
commite809f4e54ced9fc5e8ac3e80537e42dbca9dbc72 (patch)
treef53a80a7f7a5b806a357410b4a7050e2612960fb /src
parent72cb103cf518c86d8d094380d9f8e16650a0060b (diff)
g3dvl/xlib: fix build by changing include order
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 <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/gallium/winsys/g3dvl/xlib/xsp_winsys.c4
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 e86d92f40d0..c0c7cdea737 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"