diff options
| -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 | ||||
| -rw-r--r-- | include/vcl/glxtestprocess.hxx | 20 | ||||
| -rw-r--r-- | vcl/inc/opengl/x11/glxtest.hxx | 4 | ||||
| -rw-r--r-- | vcl/source/salmain/salmain.cxx | 5 | ||||
| -rw-r--r-- | vcl/unx/glxtest.cxx | 1 |
7 files changed, 24 insertions, 13 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> diff --git a/include/vcl/glxtestprocess.hxx b/include/vcl/glxtestprocess.hxx new file mode 100644 index 000000000000..b13312ebda64 --- /dev/null +++ b/include/vcl/glxtestprocess.hxx @@ -0,0 +1,20 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#ifndef INCLUDED_INCLUDE_VCL_GLXTESTPROCESS_HXX + +#include <sal/config.h> + +bool fire_glxtest_process(); + +void reap_glxtest_process(); + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/vcl/inc/opengl/x11/glxtest.hxx b/vcl/inc/opengl/x11/glxtest.hxx index d74436aae111..5715a6d9fb19 100644 --- a/vcl/inc/opengl/x11/glxtest.hxx +++ b/vcl/inc/opengl/x11/glxtest.hxx @@ -16,10 +16,6 @@ VCL_DLLPUBLIC int* getGlxPipe(); VCL_DLLPUBLIC pid_t* getGlxPid(); -bool fire_glxtest_process(); - -void reap_glxtest_process(); - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/salmain/salmain.cxx b/vcl/source/salmain/salmain.cxx index b2b45a89e934..ccf5732260ed 100644 --- a/vcl/source/salmain/salmain.cxx +++ b/vcl/source/salmain/salmain.cxx @@ -23,15 +23,12 @@ #include <sal/main.h> #include <tools/extendapplicationenvironment.hxx> +#include <vcl/glxtestprocess.hxx> #include <vcl/vclmain.hxx> #include <vcl/svmain.hxx> #include <salinst.hxx> -#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID && !defined LIBO_HEADLESS && !defined HAIKU -#include <opengl/x11/glxtest.hxx> -#endif - SAL_IMPLEMENT_MAIN() { #if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID && !defined LIBO_HEADLESS && !defined HAIKU fire_glxtest_process(); diff --git a/vcl/unx/glxtest.cxx b/vcl/unx/glxtest.cxx index 38d70aa490e2..b3c6a7521de7 100644 --- a/vcl/unx/glxtest.cxx +++ b/vcl/unx/glxtest.cxx @@ -39,6 +39,7 @@ #include <X11/Xutil.h> #include <sal/log.hxx> +#include <vcl/glxtestprocess.hxx> // stuff from glx.h typedef struct __GLXcontextRec *GLXContext; |