diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2020-06-29 13:57:53 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-29 13:57:53 +0200 |
commit | 5bf7c769f0ec164bfa9c970c174711c1f02816bd (patch) | |
tree | 9b845dff0902ad672ab1c10e23b64e64fdffd1f1 /platform/linuxbsd/os_linuxbsd.cpp | |
parent | 9fc65fd1f15b2ae2e26cf69c54819e7d6598fa05 (diff) | |
parent | 524f061c015b8070de73381bf6b7932514de79de (diff) |
Merge pull request #39945 from akien-mga/x11-XGetWindowProperty-memleak
X11: Ensure XGetWindowProperty data gets freed
Diffstat (limited to 'platform/linuxbsd/os_linuxbsd.cpp')
-rw-r--r-- | platform/linuxbsd/os_linuxbsd.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/platform/linuxbsd/os_linuxbsd.cpp b/platform/linuxbsd/os_linuxbsd.cpp index 09a5eca914..8c6f3b1167 100644 --- a/platform/linuxbsd/os_linuxbsd.cpp +++ b/platform/linuxbsd/os_linuxbsd.cpp @@ -31,8 +31,11 @@ #include "os_linuxbsd.h" #include "core/os/dir_access.h" -#include "core/print_string.h" -#include "errno.h" +#include "main/main.h" + +#ifdef X11_ENABLED +#include "display_server_x11.h" +#endif #ifdef HAVE_MNTENT #include <mntent.h> @@ -48,12 +51,6 @@ #include <sys/types.h> #include <unistd.h> -#include "main/main.h" - -#ifdef X11_ENABLED -#include "display_server_x11.h" -#endif - void OS_LinuxBSD::initialize() { crash_handler.initialize(); |