From efcb0d4cb233786c623555c0c7c578d95616bea9 Mon Sep 17 00:00:00 2001
From: Nicky <sl.nicky.ml@googlemail.com>
Date: Thu, 1 Aug 2013 23:37:30 +0200
Subject: [PATCH] No inline assembly can be used when building for 64 bit
 Windows, disable the stackwalker in that case.

---
 indra/llcommon/nd/ndstackwalk.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/llcommon/nd/ndstackwalk.h b/indra/llcommon/nd/ndstackwalk.h
index a5909bcb3c..16f11f0635 100644
--- a/indra/llcommon/nd/ndstackwalk.h
+++ b/indra/llcommon/nd/ndstackwalk.h
@@ -51,7 +51,7 @@ namespace nd
 
 		extern "C"
 		{
-#if defined( LL_WINDOWS )
+#if defined( LL_WINDOWS ) && !defined(ND_BUILD64BIT_ARCH)
 			__forceinline __declspec(naked) sEBP* getEBP()
 			{
 				__asm{