[ros-diffs] [tkreuzer] 39425: Merge 37493, 37494 from amd64 branch: Fix amd64 / ia64 default definition of RtlGetCallersAddress (Timo Kreuzer)

Author: tkreuzer
Date: Thu Feb  5 17:35:51 2009
New Revision: 39425

URL: http://svn.reactos.org/svn/reactos?rev=39425&view=rev
Log:
Merge 37493,37494 from amd64 branch:
Fix amd64 / ia64 default definition of RtlGetCallersAddress (Timo Kreuzer)

Modified:
    trunk/reactos/include/ddk/winddk.h
    trunk/reactos/ntoskrnl/include/precomp.h

Modified: trunk/reactos/include/ddk/winddk.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=3…
==============================================================================
--- trunk/reactos/include/ddk/winddk.h [iso-8859-1] (original)
+++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Thu Feb  5 17:35:51 2009
@@ -6777,12 +6777,18 @@
 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

Modified: trunk/reactos/ntoskrnl/include/precomp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/precomp.h…
==============================================================================
--- trunk/reactos/ntoskrnl/include/precomp.h [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/include/precomp.h [iso-8859-1] Thu Feb  5 17:35:51 2009
@@ -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>