Merge 37493,37494 from amd64 branch:

Fix amd64 / ia64 default definition of RtlGetCallersAddress (Timo Kreuzer)

svn path=/trunk/; revision=39425
This commit is contained in:
Timo Kreuzer 2009-02-05 23:35:51 +00:00
parent f1011d8bb5
commit 47193f550f
2 changed files with 7 additions and 0 deletions

View file

@ -6777,12 +6777,18 @@ NTAPI
RtlFreeUnicodeString(
IN PUNICODE_STRING UnicodeString);
#if (defined(_M_AMD64) || defined(_M_IA64)) && !defined(_REALLY_GET_CALLERS_CALLER_)
#define RtlGetCallersAddress(CallersAddress, CallersCaller) \
*CallersAddress = (PVOID)_ReturnAddress(); \
*CallersCaller = NULL;
#else
NTSYSAPI
VOID
NTAPI
RtlGetCallersAddress(
OUT PVOID *CallersAddress,
OUT PVOID *CallersCaller);
#endif
NTSYSAPI
NTSTATUS

View file

@ -13,6 +13,7 @@
#include <psdk/ntverp.h>
/* DDK/IFS/NDK Headers */
#define _REALLY_GET_CALLERS_CALLER
#ifdef _MSC_VER
#include <excpt.h>
#include <ntdef.h>