summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Sustrik <sustrik@250bpm.com>2010-10-26 15:35:56 +0200
committerMartin Sustrik <sustrik@250bpm.com>2010-10-26 15:35:56 +0200
commit401986e6bb565f94d975acaba9504eb6ee3c8598 (patch)
tree19e7ad0ab358a85eec58f630a3044ed814c8593a
parente1debf15bbdb0747cffb6013d59fb3f73462a600 (diff)
Build with MSVC2005 fixed
To use __rdtsc() function MSVC2005 requires including intrin.h Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
-rw-r--r--AUTHORS1
-rw-r--r--src/clock.cpp4
2 files changed, 5 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS
index 80be1ef..1c08db9 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -67,6 +67,7 @@ John Apps <john.apps@hp.com>
Markus Fischer <markus.fischer@hpc-solutions.com>
Matt Muggeridge <Matt.Muggeridge@hp.com>
Michael Santy <Michael.Santy@dynetics.com>
+Oleg Sevostyanov <oleg.sev@gmail.com>
Paulo Henrique Silva <ph.silva@gmail.com>
Peter Busser <busserpeter@gmail.com>
Peter Lemenkov <lemenkov@gmail.com>
diff --git a/src/clock.cpp b/src/clock.cpp
index 432b48e..5d91df5 100644
--- a/src/clock.cpp
+++ b/src/clock.cpp
@@ -25,6 +25,10 @@
#include <stddef.h>
+#if defined _MSC_VER
+#include <intrin.h>
+#endif
+
#if !defined ZMQ_HAVE_WINDOWS
#include <sys/time.h>
#endif