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 /vcl | |
| 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 'vcl')
| -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 |
3 files changed, 2 insertions, 8 deletions
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; |