generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-14 11:06:59 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2976 from zeromq/revert-2974-static_init_gcc

Browse Source 
Revert "Problem: mis-detection of threadsafe_static_init causes test failures"
This commit is contained in:
Luca Boccassi 2018-03-07 15:18:16 +00:00 committed by GitHub
commit 40c6c1a7c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/random.cpp
View File

@ -92,8 +92,9 @@ uint32_t zmq::generate_random ()
// configurable via config.h // configurable via config.h
// TODO this should probably be done via config.h // TODO this should probably be done via config.h
#if (defined(__cpp_threadsafe_static_init) \ #if __cplusplus >= 201103L \
&& __cpp_threadsafe_static_init >= 200806) \ || (defined(__cpp_threadsafe_static_init) \
&& __cpp_threadsafe_static_init >= 200806) \
|| (defined(_MSC_VER) && _MSC_VER >= 1900) || (defined(_MSC_VER) && _MSC_VER >= 1900)
#define ZMQ_HAVE_THREADSAFE_STATIC_LOCAL_INIT 1 #define ZMQ_HAVE_THREADSAFE_STATIC_LOCAL_INIT 1
// TODO this might probably also be set if a sufficiently recent gcc is used // TODO this might probably also be set if a sufficiently recent gcc is used