encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wayland: Fix include order when building with libdecor 

The libdecor header internally includes wayland-client.h, which pulls in the wayland-client-protocol.h file from the system include path and overrides the local one generated from the included Wayland protocol spec files. Move the Wayland protocol header inclusion above the libdecor header inclusion to ensure that the locally generated protocol header is used instead.
This commit is contained in:
Frank Praznik 2022-07-15 10:44:38 -04:00 committed by Sam Lantinga
parent 4ca7b378c5
commit d731ad769d
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/video/wayland/SDL_waylanddyn.h
View File

@ -119,6 +119,13 @@ void SDL_WAYLAND_UnloadSymbols(void);
#define wl_data_source_interface (*WAYLAND_wl_data_source_interface) #define wl_data_source_interface (*WAYLAND_wl_data_source_interface)
#define wl_data_device_manager_interface (*WAYLAND_wl_data_device_manager_interface) #define wl_data_device_manager_interface (*WAYLAND_wl_data_device_manager_interface)
/*
* These must be included before libdecor.h, otherwise the libdecor header
* pulls in the system Wayland protocol headers instead of ours.
*/
#include "wayland-client-protocol.h"
#include "wayland-egl.h"
#ifdef HAVE_LIBDECOR_H #ifdef HAVE_LIBDECOR_H
/* Must be included before our defines */ /* Must be included before our defines */
#include <libdecor.h> #include <libdecor.h>
@ -164,9 +171,6 @@ void SDL_WAYLAND_UnloadSymbols(void);
#endif /* SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC */ #endif /* SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC */
#include "wayland-client-protocol.h"
#include "wayland-egl.h"
#endif /* SDL_waylanddyn_h_ */ #endif /* SDL_waylanddyn_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */