From 99df964c96bc1b715ae6ece47629a5d7afb2a945 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 25 Mar 2019 18:27:37 +0100 Subject: Consolidate declarations of {fire,reap}_glxtest_process in single include file Change-Id: I7f25cba311d42a7e8751cf3651f684b88d1fb8ac Reviewed-on: https://gerrit.libreoffice.org/69711 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- desktop/inc/app.hxx | 5 ----- desktop/source/app/app.cxx | 1 + desktop/source/app/sofficemain.cxx | 1 + 3 files changed, 2 insertions(+), 5 deletions(-) (limited to 'desktop') diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx index 01224c68ffeb..9f885cf0bd37 100644 --- a/desktop/inc/app.hxx +++ b/desktop/inc/app.hxx @@ -181,11 +181,6 @@ OUString ReplaceStringHookProc(const OUString& rStr); } -#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID && !defined LIBO_HEADLESS -bool fire_glxtest_process(); -void reap_glxtest_process(); -#endif - #endif // INCLUDED_DESKTOP_INC_APP_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 4f6dbca894ae..1f910a6b1f21 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -106,6 +106,7 @@ #include #include #include +#include #include #include #include diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx index 67bb08f48022..805c4f07602e 100644 --- a/desktop/source/app/sofficemain.cxx +++ b/desktop/source/app/sofficemain.cxx @@ -33,6 +33,7 @@ #include #include #include +#include #include #include -- cgit