From 2a1d7cab3d02f0a099756b2d8e168cc1c64ef577 Mon Sep 17 00:00:00 2001 From: Andreas Holzammer Date: Fri, 18 Jan 2013 10:08:52 +0100 Subject: [V8][WINCE]Include windows headers first Include the windows headers first so that the ASSERTION macro can be overwritten of the version of V8. Change-Id: I006e75a90586ea28bf15fc0d3686585429c11975 Reviewed-by: Peter Varga Reviewed-by: David Faure Reviewed-by: Janne Anttila --- src/3rdparty/v8/src/optimizing-compiler-thread.cc | 5 +++++ src/3rdparty/v8/src/v8.h | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/src/3rdparty/v8/src/optimizing-compiler-thread.cc b/src/3rdparty/v8/src/optimizing-compiler-thread.cc index 06018dd..83ff104 100644 --- a/src/3rdparty/v8/src/optimizing-compiler-thread.cc +++ b/src/3rdparty/v8/src/optimizing-compiler-thread.cc @@ -25,6 +25,11 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// For Windows CE, Windows headers need to be included first as they define ASSERT +#ifdef _WIN32_WCE +# include "win32-headers.h" +#endif + #include "optimizing-compiler-thread.h" #include "v8.h" diff --git a/src/3rdparty/v8/src/v8.h b/src/3rdparty/v8/src/v8.h index 67716d8..201cdf2 100644 --- a/src/3rdparty/v8/src/v8.h +++ b/src/3rdparty/v8/src/v8.h @@ -48,6 +48,11 @@ #error both DEBUG and NDEBUG are set #endif +// For Windows CE, Windows headers need to be included first as they define ASSERT +#ifdef _WIN32_WCE +# include "win32-headers.h" +#endif + // Basic includes #include "../include/v8.h" #include "v8globals.h" -- cgit v1.2.1