From ec4bc6b8e9d1a83526573d27afd099debbd5b86b Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Thu, 6 Jun 2024 10:46:09 +0200 Subject: [PATCH] fix FTBS on bool Fix name clash between stdbool.h and xf86str.h Signed-off-by: Enrico Weigelt, metux IT consult Part-of: --- src/vboxvideo.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/vboxvideo.h b/src/vboxvideo.h index 65a0dd6..8323a30 100644 --- a/src/vboxvideo.h +++ b/src/vboxvideo.h @@ -42,6 +42,13 @@ #ifndef _VBOXVIDEO_H_ #define _VBOXVIDEO_H_ +/* these *must* come before anything else that might include stdbool.h, + otherwise we're running into trouble with older X headers (up to 1.20) + using "bool" as field name */ +#include "xf86.h" +#include "xf86str.h" +#include "xf86Cursor.h" + #include #include #include "version-generated.h" @@ -59,9 +66,6 @@ #include "config.h" #endif -#include "xf86.h" -#include "xf86str.h" -#include "xf86Cursor.h" #ifdef DEBUG