diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-07-20 11:27:17 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-07-21 11:01:29 +0200 |
| commit | 4c00a5bce384c5fa3b46cf5bb29c7e9b1e506ea0 (patch) | |
| tree | 939e9f15ea540713ae06dbfcd747de9856f563ce /desktop | |
| parent | f3a82f04dd1e16a3c317fd73ad7dc076e73cf4da (diff) | |
Assume that, if we have X11, it supports Xinerama
By now, Xinerama is old enough that we can use the X11 server supports
it
Change-Id: Ida95902916697808c611a53274b1f0299fd298b7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154666
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/Executable_oosplash.mk | 2 | ||||
| -rw-r--r-- | desktop/unx/source/splashx.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/desktop/Executable_oosplash.mk b/desktop/Executable_oosplash.mk index 5c7e4ac95bb4..308c76945aef 100644 --- a/desktop/Executable_oosplash.mk +++ b/desktop/Executable_oosplash.mk @@ -23,7 +23,7 @@ $(eval $(call gb_Executable_add_cobjects,oosplash,\ desktop/unx/source/start \ )) -ifneq ($(USE_XINERAMA),) +ifneq ($(USING_X11),) $(eval $(call gb_Executable_add_defs,oosplash,\ -DUSE_XINERAMA \ diff --git a/desktop/unx/source/splashx.c b/desktop/unx/source/splashx.c index afd137d06876..4f7239ab6159 100644 --- a/desktop/unx/source/splashx.c +++ b/desktop/unx/source/splashx.c @@ -16,7 +16,7 @@ #include <X11/Xatom.h> #include <X11/Xutil.h> -#ifdef USE_XINERAMA +#ifdef USING_X11 #include <X11/extensions/Xinerama.h> #endif @@ -406,7 +406,7 @@ static int splash_init_display( struct splash* splash, int argc, char** argv ) { char *display_name = NULL; int i; -#ifdef USE_XINERAMA +#ifdef USING_X11 int n_xinerama_screens = 1; XineramaScreenInfo* p_screens = NULL; #endif @@ -442,7 +442,7 @@ static int splash_init_display( struct splash* splash, int argc, char** argv ) splash->display_x_pos = 0; splash->display_y_pos = 0; -#ifdef USE_XINERAMA +#ifdef USING_X11 p_screens = XineramaQueryScreens( splash->display, &n_xinerama_screens ); if( p_screens ) { |