summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Dirsch <sndirsch@suse.de>2014-10-07 11:29:32 +0200
committerPhilippe Coval <philippe.coval@open.eurogiciel.org>2014-12-10 18:19:27 +0100
commiteb28d3c4fe73fe00ab35489b5f0dcced207733c6 (patch)
tree3a842ed5ae608dbfb228fa586071ef75a51ca4c3
parent2ab395528199512d354e0513924dc0e617f12cc0 (diff)
downloadxf86-video-vmware-eb28d3c4fe73fe00ab35489b5f0dcced207733c6.tar.gz
xf86-video-vmware-eb28d3c4fe73fe00ab35489b5f0dcced207733c6.tar.bz2
xf86-video-vmware-eb28d3c4fe73fe00ab35489b5f0dcced207733c6.zip
xf86xv.h cannot be included without first including xorg-server.h.submit/tizen_common/20141210.175147
Without this the build fails on systems with the latest glibc, throwing this error: In file included from /usr/include/string.h:634:0, from /usr/include/xorg/os.h:53, from /usr/include/xorg/misc.h:115, from /usr/include/xorg/screenint.h:50, from /usr/include/xorg/scrnintstr.h:50, from /usr/include/xorg/xvdix.h:55, from /usr/include/xorg/xf86xv.h:32, from vmwgfx_overlay.c:38: /usr/include/xorg/os.h:579:1: error: expected identifier or '(' before '__extension__' strndup(const char *str, size_t n); This is caused by HAVE_STRNDUP not being set (it is set from xorg-server.h), causing os.h to redefine it. Change-Id: I3a8b19e1393733620cb4cce10811efec45445129 Signed-off-by: Stefan Dirsch <sndirsch@suse.de> Reviewed-by: Daniel Stone <daniels@collabora.com> Acked-by: Thomas Hellstrom <thellstrom@vmware.com> Origin: upstream
-rw-r--r--vmwgfx/vmwgfx_overlay.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/vmwgfx/vmwgfx_overlay.c b/vmwgfx/vmwgfx_overlay.c
index 2c0d7fa..e651557 100644
--- a/vmwgfx/vmwgfx_overlay.c
+++ b/vmwgfx/vmwgfx_overlay.c
@@ -35,6 +35,7 @@
*/
+#include "xorg-server.h"
#include "xf86xv.h"
#include "fourcc.h"
#define debug_printf(...)