Merged revisions 6935-6936 via svnmerge from

svn+ssh://[email protected]/FPC/svn/fpc/trunk

........
r6935 | chrivers | 2007-03-19 19:44:23 +0100 (Mon, 19 Mar 2007) | 1 line

 * Fixed uses-clause in jwanative.pas. This fixes many compilation problems where types would be aliased to incompatible types, because jwanative.pas is also used as an include file in jwawindows.pas
........
r6936 | daniel | 2007-03-19 22:33:33 +0100 (Mon, 19 Mar 2007) | 2 lines

  + Prevent error message after program terminates.

........

git-svn-id: branches/fixes_2_2@7208 -

ide/fpmrun.inc

@@ -99,7 +99,8 @@ begin
      else
       Debugger^.TraceNext;
     end;}
-  Debugger^.AnnotateError;
+  if Debugger^.IsRunning then
+    Debugger^.AnnotateError;
 {$else NODEBUG}
   NoDebugger;
 {$endif NODEBUG}

packages/base/winunits/jwanative.pas

@@ -170,7 +170,7 @@ unit JwaNative;
 interface
 {$INCLUDE jediapilib.inc}
 uses
-  JwaWindows;
+  JwaWinType, JwaWinBase, JwaNTStatus, JwaWinNT;
 
 {$WEAKPACKAGEUNIT}