Mercurial > hg > graal-jvmci-8
diff src/os_cpu/windows_x86/vm/unwind_windows_x86.hpp @ 11144:33c52908bcdb
8015759: hotspot changes needed to compile with Visual Studio 2012
Reviewed-by: anthony, dholmes, dcubed
Contributed-by: Tim Bell <timothy.bell@oracle.com>
author | dholmes |
---|---|
date | Mon, 15 Jul 2013 23:23:15 -0400 |
parents | 15d6977f04b0 |
children |
line wrap: on
line diff
--- a/src/os_cpu/windows_x86/vm/unwind_windows_x86.hpp Mon Jul 15 12:06:50 2013 +0200 +++ b/src/os_cpu/windows_x86/vm/unwind_windows_x86.hpp Mon Jul 15 23:23:15 2013 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -29,10 +29,15 @@ #ifdef AMD64 typedef unsigned char UBYTE; +#if _MSC_VER < 1700 + +/* Not needed for VS2012 compiler, comes from winnt.h. */ #define UNW_FLAG_EHANDLER 0x01 #define UNW_FLAG_UHANDLER 0x02 #define UNW_FLAG_CHAININFO 0x04 +#endif + // This structure is used to define an UNWIND_INFO that // only has an ExceptionHandler. There are no UnwindCodes // declared. @@ -59,6 +64,9 @@ } RUNTIME_FUNCTION, *PRUNTIME_FUNCTION; */ +#if _MSC_VER < 1700 + +/* Not needed for VS2012 compiler, comes from winnt.h. */ typedef struct _DISPATCHER_CONTEXT { ULONG64 ControlPc; ULONG64 ImageBase; @@ -71,6 +79,8 @@ PVOID HandlerData; } DISPATCHER_CONTEXT, *PDISPATCHER_CONTEXT; +#endif + #if _MSC_VER < 1500 /* Not needed for VS2008 compiler, comes from winnt.h. */