diff options
| author | Enrico Weigelt, metux IT consult <info@metux.net> | 2024-06-06 10:46:09 +0200 |
|---|---|---|
| committer | Enrico Weigelt, metux IT consult <info@metux.net> | 2024-06-06 18:34:34 +0200 |
| commit | ec4bc6b8e9d1a83526573d27afd099debbd5b86b (patch) | |
| tree | 40a0bf53d0e3bb202f30d4fdeec8afece5acd270 | |
| parent | 4653800f830b1a1d22ff23b581073efb7984193b (diff) | |
Fix name clash between stdbool.h and xf86str.h
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-vbox/-/merge_requests/9>
| -rw-r--r-- | src/vboxvideo.h | 10 |
1 files 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 <VBoxVideoGuest.h> #include <VBoxVideo.h> #include "version-generated.h" @@ -59,9 +66,6 @@ #include "config.h" #endif -#include "xf86.h" -#include "xf86str.h" -#include "xf86Cursor.h" #ifdef DEBUG |