From ee112cff56081fb9d0b74c987a8935acc360b05c Mon Sep 17 00:00:00 2001 From: Benoit Steiner Date: Wed, 10 May 2017 21:12:21 -0700 Subject: Merge changes from github. PiperOrigin-RevId: 155709893 --- third_party/eigen3/unsupported/Eigen/CXX11/Tensor | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'third_party/eigen3') diff --git a/third_party/eigen3/unsupported/Eigen/CXX11/Tensor b/third_party/eigen3/unsupported/Eigen/CXX11/Tensor index 00d2e7c0c7..861a87b68b 100644 --- a/third_party/eigen3/unsupported/Eigen/CXX11/Tensor +++ b/third_party/eigen3/unsupported/Eigen/CXX11/Tensor @@ -1,9 +1,11 @@ -#ifdef _WIN32 -#define sleep(seconds) Sleep(1000*seconds) -#endif // _WIN32 #include "unsupported/Eigen/CXX11/Tensor" #ifdef _WIN32 +#ifndef SLEEP_FUNC_HEADER_GUARD +#define SLEEP_FUNC_HEADER_GUARD +inline void sleep(unsigned int seconds) { Sleep(1000*seconds); } +#endif + // On Windows, Eigen will include Windows.h, which defines various // macros that conflict with TensorFlow symbols. Undefine them here to // prevent clashes. -- cgit v1.2.3