Skip to content

L
libzmq
Commit 89ecf2de authored by Richard Newton's avatar Richard Newton
Browse files
Options

Merge pull request #744 from psl-felipefarinon/master 

Fixing broken build issue #583
parents 1596a5e8 485db41a
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
src/clock.cpp
View file @ 89ecf2de
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
#include <time.h> #include <time.h>
#endif #endif
#ifdef ZMQ_HAVE_WINDOWS
typedef ULONGLONG (*f_compatible_get_tick_count64)(); typedef ULONGLONG (*f_compatible_get_tick_count64)();
static zmq::mutex_t compatible_get_tick_count64_mutex; static zmq::mutex_t compatible_get_tick_count64_mutex;
...@@ -75,6 +76,7 @@ f_compatible_get_tick_count64 init_compatible_get_tick_count64() ...@@ -75,6 +76,7 @@ f_compatible_get_tick_count64 init_compatible_get_tick_count64()
} }
static f_compatible_get_tick_count64 my_get_tick_count64 = init_compatible_get_tick_count64(); static f_compatible_get_tick_count64 my_get_tick_count64 = init_compatible_get_tick_count64();
#endif
zmq::clock_t::clock_t () : zmq::clock_t::clock_t () :
last_tsc (rdtsc ()), last_tsc (rdtsc ()),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment