From 50ad8b901053c08519663c0f0310fe9c70365e9f Mon Sep 17 00:00:00 2001
From: Benoit Jacob <jacob.benoit.1@gmail.com>
Date: Sat, 10 Jan 2009 14:10:40 +0000
Subject: [PATCH] fix potential compilation issue on MSVC + no vectorization

---
 Eigen/Core | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Eigen/Core b/Eigen/Core
index d4626cfa3..7f42a6c29 100644
--- a/Eigen/Core
+++ b/Eigen/Core
@@ -3,7 +3,9 @@
 
 // first thing Eigen does: prevent MSVC from committing suicide
 #include "src/Core/util/DisableMSVCWarnings.h"
+
 #ifdef _MSC_VER
+  #include <malloc.h> // for _aligned_malloc -- need it regardless of whether vectorization is enabled
   #if (_MSC_VER >= 1500) // 2008 or later
     // Remember that usage of defined() in a #define is undefined by the standard
     #ifdef _M_IX86_FP
@@ -59,10 +61,6 @@
 #include <string>
 #include <limits>
 
-#if defined(EIGEN_SSE2_ON_MSVC_2008_OR_LATER) && defined(EIGEN_VECTORIZE)
-  #include <malloc.h> // for _aligned_malloc
-#endif
-
 #if (defined(_CPPUNWIND) || defined(__EXCEPTIONS)) && !defined(EIGEN_NO_EXCEPTIONS)
   #define EIGEN_EXCEPTIONS
 #endif