From: Erik Charlebois <erikcharlebois@gmail.com>
Date: Mon, 13 May 2013 22:19:52 +0000 (-0400)
Subject: VM: Fix Windows 64-bit build on Visual Studio 2012
X-Git-Tag: 0.97~1248
X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=40fcee3f16a356a541865e2b405929881fc36192

VM: Fix Windows 64-bit build on Visual Studio 2012

The UNW_FLAG_EHANDLER #define is now visible in VS2012, causing
a conflict with the definition in os-windows-x86.64.cpp. Added
a #ifndef to only include the definition if it hasn't already
been defined.
---

diff --git a/vm/os-windows-x86.64.cpp b/vm/os-windows-x86.64.cpp
index c0220851e2..42e1416ca7 100644
--- a/vm/os-windows-x86.64.cpp
+++ b/vm/os-windows-x86.64.cpp
@@ -4,7 +4,9 @@ namespace factor {
 
 typedef unsigned char UBYTE;
 
+#ifndef UNW_FLAG_EHANDLER
 const UBYTE UNW_FLAG_EHANDLER = 0x1;
+#endif
 
 struct UNWIND_INFO {
   UBYTE Version : 3;