From bb1f50b7b11fddec27efc4a436f64147f746f93e Mon Sep 17 00:00:00 2001 From: Konstantin Ritt Date: Thu, 6 Oct 2011 12:09:14 +0200 Subject: QHostInfo: fix a race condition under CE Merge-request: 1339 Reviewed-by: Joerg Bornemann Change-Id: Id1f977ad8f746ac848c355880cac688e256721d8 Reviewed-on: http://codereview.qt-project.org/6145 Reviewed-by: Qt Sanity Bot Reviewed-by: Joerg Bornemann --- src/network/kernel/qhostinfo_win.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/network/kernel/qhostinfo_win.cpp') diff --git a/src/network/kernel/qhostinfo_win.cpp b/src/network/kernel/qhostinfo_win.cpp index 6fc5b7bd24..10528634db 100644 --- a/src/network/kernel/qhostinfo_win.cpp +++ b/src/network/kernel/qhostinfo_win.cpp @@ -97,14 +97,15 @@ static void resolveLibrary() #if defined(Q_OS_WINCE) #include -QMutex qPrivCEMutex; +Q_GLOBAL_STATIC(QMutex, qPrivCEMutex) #endif QHostInfo QHostInfoAgent::fromName(const QString &hostName) { #if defined(Q_OS_WINCE) - QMutexLocker locker(&qPrivCEMutex); + QMutexLocker locker(qPrivCEMutex()); #endif + QWindowsSockInit winSock; // Load res_init on demand. -- cgit v1.2.3