diff options
author | Stefan Dirsch <sndirsch@suse.de> | 2014-10-07 11:29:32 +0200 |
---|---|---|
committer | Geoffroy Van Cutsem <geoffroy.vancutsem@intel.com> | 2014-12-04 13:36:36 +0100 |
commit | d66057f876254f9b0b61d03f43eedb0adf43b988 (patch) | |
tree | d6d3cc0c044488490ca5f623c3110321dae53094 | |
parent | 1ecaaef33d9d2da24890a3fdd96966e2f971ee9d (diff) | |
download | xf86-video-vmware-sandbox/gvancuts/x11-vmware.tar.gz xf86-video-vmware-sandbox/gvancuts/x11-vmware.tar.bz2 xf86-video-vmware-sandbox/gvancuts/x11-vmware.zip |
xf86xv.h cannot be included without first including xorg-server.h.sandbox/gvancuts/x11-vmware
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.
Signed-off-by: Stefan Dirsch <sndirsch@suse.de>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Acked-by: Thomas Hellstrom <thellstrom@vmware.com>
-rw-r--r-- | vmwgfx/vmwgfx_overlay.c | 1 |
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(...) |