Mercurial > hg > svcore

diff base/RealTime.h @ 1221:a1b97df9962e 3.0-integration

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch msvc2015_64
author Chris Cannam
date Thu, 20 Oct 2016 11:16:22 +0100
parents c811991a5efa
children 48e9f538e6e9
line wrap: on
line diff
--- a/base/RealTime.h	Tue Oct 18 14:03:35 2016 +0100
+++ b/base/RealTime.h	Thu Oct 20 11:16:22 2016 +0100
@@ -28,7 +28,11 @@
 
 #include <vamp-hostsdk/RealTime.h>
 
-struct timeval;
+#ifdef _MSC_VER
+#include "winsock.h" // struct timeval is in here
+#else
+#include "sys/time.h"
+#endif
 
 /**
  * RealTime represents time values to nanosecond precision