Stephan Bergmann
811769f009
...as emsdk 5.0.3 deprecated the predefined EMSCRIPTEN macro (see <https://github.com/emscripten-core/emscripten/commit/506052bd8b4e23ded7f2351c62ca3b24d40c8cf3> "Warn about usage of deprecated EMSCRIPTEN macro. NFC (#26381)"), causing failures like > In file included from static/source/unoembindhelpers/PrimaryBindings.cxx:29: > In file included from include/sfx2/viewsh.hxx:35: > In file included from include/editeng/outliner.hxx:32: > In file included from include/tools/color.hxx:26: > include/osl/endian.h:66:15: error: macro 'EMSCRIPTEN' has been marked as deprecated: use __EMSCRIPTEN__ instead [-Werror,-Wdeprecated-pragma] > 66 | #elif defined EMSCRIPTEN > | ^ > /home/sberg/emsdk/5.0.4/emsdk/emscripten/main/cache/sysroot/include/emscripten/emscripten.h:35:66: note: macro marked 'deprecated' here > 35 | #pragma clang deprecated(EMSCRIPTEN, "use __EMSCRIPTEN__ instead") > | ^ To avoid confusion, also suppress the -D$(OS) in solenv/gbuild/platform/unxgcc.mk that would unnecessarily keep defining EMSCRIPTEN. Change-Id: Ic1f187cf1c6417cd95d4092e9cea01a665bd1b2f Reviewed-on: https://gerrit.collaboraoffice.com/c/core/+/34 Reviewed-by: Michael Stahl <michael.stahl@collabora.com> Tested-by: Jenkins CPCI <releng@collaboraoffice.com> (cherry picked from commit 50291c2ed83bdb49bb827a4a12905d94b8c42035) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/205167 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
55 lines
1.3 KiB
C++
55 lines
1.3 KiB
C++
/* -*- 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/.
|
|
*/
|
|
|
|
#include <sal/config.h>
|
|
|
|
#include <config_emscripten.h>
|
|
#include <config_vclplug.h>
|
|
|
|
#if defined __EMSCRIPTEN__ && ENABLE_QT6 && HAVE_EMSCRIPTEN_JSPI \
|
|
&& !HAVE_EMSCRIPTEN_PROXY_TO_PTHREAD
|
|
|
|
#include <comphelper/emscriptenthreading.hxx>
|
|
|
|
#include <mutex>
|
|
#include <thread>
|
|
|
|
namespace
|
|
{
|
|
std::mutex mutex;
|
|
comphelper::emscriptenthreading::Data* data = nullptr;
|
|
}
|
|
|
|
comphelper::emscriptenthreading::Data& comphelper::emscriptenthreading::getData()
|
|
{
|
|
std::scoped_lock g(mutex);
|
|
if (data == nullptr)
|
|
{
|
|
data = new Data;
|
|
std::thread t([] { emscripten_exit_with_live_runtime(); });
|
|
data->eventHandlerThread = t.native_handle();
|
|
t.detach();
|
|
}
|
|
return *data;
|
|
}
|
|
|
|
void comphelper::emscriptenthreading::tearDown()
|
|
{
|
|
std::scoped_lock g(mutex);
|
|
if (data != nullptr)
|
|
{
|
|
delete data;
|
|
data = nullptr;
|
|
}
|
|
}
|
|
|
|
#endif
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
|