diff options
| author |  A. Unique TensorFlower <gardener@tensorflow.org> | 2016-10-10 10:26:22 -0800 |
|---|---|---|
| committer | TensorFlower Gardener <gardener@tensorflow.org> | 2016-10-10 11:35:00 -0700 |
| commit | edaf3b342db4afa1c872da541fb0ac176a4e8ef9 (patch) | |
| tree | b976073fdc2a6404cbdc3ee323a637e2e1b16846 /third_party/eigen3 | |
| parent | d1518c26530daaee854e73365bd7dfb9a2f69dbd (diff) | |
Merge changes from github.
Change: 135698415
Diffstat (limited to 'third_party/eigen3')
| -rw-r--r-- | third_party/eigen3/unsupported/Eigen/CXX11/Tensor | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/third_party/eigen3/unsupported/Eigen/CXX11/Tensor b/third_party/eigen3/unsupported/Eigen/CXX11/Tensor index 41db119921..7fafd2a538 100644 --- a/third_party/eigen3/unsupported/Eigen/CXX11/Tensor +++ b/third_party/eigen3/unsupported/Eigen/CXX11/Tensor @@ -1 +1,10 @@ #include "unsupported/Eigen/CXX11/Tensor" + +#ifdef _WIN32 +// On Windows, Eigen will include Windows.h, which defines various +// macros that conflict with TensorFlow symbols. Undefine them here to +// prevent clashes. +#undef DeleteFile +#undef ERROR +#undef LoadLibrary +#endif // _WIN32 |