diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-03-25 18:27:37 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-03-26 08:43:28 +0100 |
| commit | 99df964c96bc1b715ae6ece47629a5d7afb2a945 (patch) | |
| tree | 90dae6b0344fbbe79427de93f595e97fa72920d2 /desktop | |
| parent | 055480aac88e4688619e9a7815e0a8b0ab97a5a1 (diff) | |
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 <sbergman@redhat.com>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/inc/app.hxx | 5 | ||||
| -rw-r--r-- | desktop/source/app/app.cxx | 1 | ||||
| -rw-r--r-- | desktop/source/app/sofficemain.cxx | 1 |
3 files changed, 2 insertions, 5 deletions
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 <svtools/miscopt.hxx> #include <svtools/menuoptions.hxx> #include <rtl/bootstrap.hxx> +#include <vcl/glxtestprocess.hxx> #include <vcl/help.hxx> #include <vcl/weld.hxx> #include <vcl/settings.hxx> 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 <rtl/bootstrap.hxx> #include <sal/log.hxx> #include <tools/extendapplicationenvironment.hxx> +#include <vcl/glxtestprocess.hxx> #include <vcl/svmain.hxx> #include <com/sun/star/beans/NamedValue.hpp> |