diff -r 82d4e10b7c6b -r d8e6e11e7f32 hotspot/src/os_cpu/windows_x86/vm/unwind_windows_x86.hpp --- a/hotspot/src/os_cpu/windows_x86/vm/unwind_windows_x86.hpp Fri Mar 13 18:39:22 2009 -0700 +++ b/hotspot/src/os_cpu/windows_x86/vm/unwind_windows_x86.hpp Mon Mar 16 15:06:33 2009 -0700 @@ -68,6 +68,9 @@ PVOID HandlerData; } DISPATCHER_CONTEXT, *PDISPATCHER_CONTEXT; +#if MSC_VER < 1500 + +/* Not needed for VS2008 compiler, comes from winnt.h. */ typedef EXCEPTION_DISPOSITION (*PEXCEPTION_ROUTINE) ( IN PEXCEPTION_RECORD ExceptionRecord, IN ULONG64 EstablisherFrame, @@ -75,4 +78,6 @@ IN OUT PDISPATCHER_CONTEXT DispatcherContext ); +#endif + #endif // AMD64