From 8fabc59c3ed8ffab72075d501ea474c8e1af6e7d Mon Sep 17 00:00:00 2001
From: michael <michael@freepascal.org>
Date: Tue, 18 Mar 2003 08:48:41 +0000
Subject: [PATCH] + Patch from peter to correct frame trace

---
 rtl/go32v2/dpmiexcp.pp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/rtl/go32v2/dpmiexcp.pp b/rtl/go32v2/dpmiexcp.pp
index f5a1b8e79a..9f98f15f3b 100644
--- a/rtl/go32v2/dpmiexcp.pp
+++ b/rtl/go32v2/dpmiexcp.pp
@@ -749,8 +749,13 @@ end;
 procedure show_call_frame(djgpp_exception_state : pexception_state);
 begin
   errln('Call frame traceback EIPs:');
+{$ifdef VER1_0}
   errln(BackTraceStrFunc(djgpp_exception_state^.__eip));
   dump_stack(stderr,djgpp_exception_state^.__ebp);
+{$else}
+  errln(BackTraceStrFunc(Pointer(djgpp_exception_state^.__eip)));
+  dump_stack(stderr,Pointer(djgpp_exception_state^.__ebp));
+{$endif}
 end;
 
 
@@ -1515,7 +1520,11 @@ begin
       eip:=djgpp_exception_state_ptr^.__eip;
       ebp:=djgpp_exception_state_ptr^.__ebp;
       djgpp_exception_state_ptr:=djgpp_exception_state_ptr^.__exception_ptr;
+{$ifdef VER1_0}
       HandleErrorAddrFrame(ErrorOfSig,eip,ebp);
+{$else}
+      HandleErrorAddrFrame(ErrorOfSig,pointer(eip),pointer(ebp));
+{$endif}
     End
   else
     { probably higher level is required }
@@ -1537,7 +1546,10 @@ end;
 {$endif IN_SYSTEM}
 {
   $Log$
-  Revision 1.11  2002-10-14 19:39:16  peter
+  Revision 1.12  2003-03-18 08:48:41  michael
+  + Patch from peter to correct frame trace
+
+  Revision 1.11  2002/10/14 19:39:16  peter
     * threads unit added for thread support
 
   Revision 1.10  2002/09/07 16:01:18  peter