mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-22 13:18:28 +00:00
update other build systems, use lyx::Mutex
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37223 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
06f26e85df
commit
b5216b25f7
@ -308,6 +308,7 @@ src_support_header_files = Split('''
|
||||
lyxalgo.h
|
||||
lyxlib.h
|
||||
lyxtime.h
|
||||
mutex.h
|
||||
Messages.h
|
||||
numpunct_lyx_char_type.h
|
||||
os.h
|
||||
@ -348,6 +349,7 @@ src_support_files = Split('''
|
||||
lassert.cpp
|
||||
lstrings.cpp
|
||||
lyxtime.cpp
|
||||
mutex.cpp
|
||||
Messages.cpp
|
||||
os.cpp
|
||||
Package.cpp
|
||||
|
@ -71,6 +71,8 @@ liblyxsupport_a_SOURCES = \
|
||||
lyxlib.h \
|
||||
lyxtime.cpp \
|
||||
lyxtime.h \
|
||||
mutex.h \
|
||||
mutex.cpp \
|
||||
Messages.cpp \
|
||||
Messages.h \
|
||||
numpunct_lyx_char_type.h \
|
||||
|
@ -14,6 +14,7 @@
|
||||
|
||||
#include "support/unicode.h"
|
||||
#include "support/debug.h"
|
||||
#include "support/mutex.h"
|
||||
|
||||
#include <iconv.h>
|
||||
|
||||
@ -25,7 +26,6 @@
|
||||
#include <ostream>
|
||||
#include <string>
|
||||
|
||||
#include <QMutexLocker>
|
||||
|
||||
using namespace std;
|
||||
|
||||
@ -67,7 +67,7 @@ struct IconvProcessor::Impl
|
||||
string tocode_;
|
||||
string fromcode_;
|
||||
|
||||
QMutex mutex_; // iconv() is not thread save, see #7240
|
||||
Mutex mutex_; // iconv() is not thread save, see #7240
|
||||
};
|
||||
|
||||
|
||||
@ -124,7 +124,7 @@ bool IconvProcessor::init()
|
||||
int IconvProcessor::convert(char const * buf, size_t buflen,
|
||||
char * outbuf, size_t maxoutsize)
|
||||
{
|
||||
QMutexLocker lock(&pimpl_->mutex_);
|
||||
Mutex::Locker lock(&pimpl_->mutex_);
|
||||
|
||||
if (buflen == 0)
|
||||
return 0;
|
||||
|
Loading…
Reference in New Issue
Block a user