commit dfd3d4ada2a73bab1a161a873d8cb601bbc18cd0
author Alexandre Julliard <julliard@winehq.org> Sat Nov 25 23:56:20 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Sat Nov 25 23:56:20 2000 +0000
tree 8997372d001bdbaf046dcb23be7328e13acc62d2
parent 1475e102edea5a2f7370e050c5568ecfe6a9eced

Moved GET_IP out of winnt.h.

dlls/kernel/debugger.c

diff --git a/dlls/kernel/debugger.c b/dlls/kernel/debugger.c
index f3d5df6..ee0a0c2 100644
--- a/dlls/kernel/debugger.c
+++ b/dlls/kernel/debugger.c
@@ -207,7 +207,7 @@
     rec.ExceptionCode    = EXCEPTION_BREAKPOINT;
     rec.ExceptionFlags   = 0;
     rec.ExceptionRecord  = NULL;
-    rec.ExceptionAddress = GET_IP(context); 
+    rec.ExceptionAddress = (LPVOID)context->Eip;
     rec.NumberParameters = 0;
     NtRaiseException( &rec, context, TRUE );
 #endif  /* defined(__i386__) */

dlls/ntdll/exception.c

diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c
index 0782e01..29f3ce8 100644
--- a/dlls/ntdll/exception.c
+++ b/dlls/ntdll/exception.c
@@ -27,7 +27,16 @@
     EXCEPTION_FRAME *prevFrame;
 } EXC_NESTED_FRAME;
 
- 
+#ifdef __i386__
+# define GET_IP(context) ((LPVOID)(context)->Eip)
+#endif
+#ifdef __sparc__
+# define GET_IP(context) ((LPVOID)(context)->pc)
+#endif
+#ifndef GET_IP
+# error You must define GET_IP for this CPU
+#endif
+
 /*******************************************************************
  *         EXC_RaiseHandler
  *

include/winnt.h

diff --git a/include/winnt.h b/include/winnt.h
index 9e22299..05433b0 100644
--- a/include/winnt.h
+++ b/include/winnt.h
@@ -793,17 +793,6 @@
 #error You need to define DEFINE_REGS_ENTRYPOINT macros for your CPU
 #endif
 
-#ifdef __i386__
-# define GET_IP(context) ((LPVOID)(context)->Eip)
-#endif
-#ifdef __sparc__
-# define GET_IP(context) ((LPVOID)(context)->pc)
-#endif
- 
-#if !defined(GET_IP) && !defined(RC_INVOKED)
-# error You must define GET_IP for this CPU
-#endif
-
 /* Constructor functions */
 
 #ifdef __GNUC__