Mercurial > hg > svcore
diff base/RealTime.h @ 1365:3382d914e110
Merge from branch 3.0-integration
author | Chris Cannam |
---|---|
date | Fri, 13 Jan 2017 10:29:44 +0000 |
parents | c811991a5efa |
children | 48e9f538e6e9 |
line wrap: on
line diff
--- a/base/RealTime.h Mon Nov 21 16:32:58 2016 +0000 +++ b/base/RealTime.h Fri Jan 13 10:29:44 2017 +0000 @@ -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