Merged revisions 8680 via svnmerge from

http://svn.freepascal.org/svn/fpc/trunk

........
r8680 | hajny | 2007-09-29 15:48:26 +0000 (Sat, 29 Sep 2007) | 1 line

  * exception handler is a function, not procedure
........

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

rtl/os2/doscalls.pas

@@ -502,7 +502,9 @@ const   MaxPathLength=260;
         MaxPathComponent=256;
 
 type    TFileLock=record
-            Offset,Range:longint;
+         case boolean of
+          false: (Offset, Range: longint);
+          true:  (lOffset, lRange: longint);
         end;
         PFileLock=^TFileLock;
         FileLock=TFileLock;
@@ -2394,10 +2396,11 @@ type        PExceptionRegistrationRecord=^TExceptionRegistrationRecord;
             PExceptionReportRecord=^TExceptionReportRecord;
             PContextRecord=^TContextRecord;
 
-            TExceptionHandler=procedure(Report:PExceptionReportRecord;
-                                        RegRec:PExceptionRegistrationRecord;
-                                        Context:PContextRecord;
-                                        DispContext:pointer); cdecl;
+            TExceptionHandler = function (Report: PExceptionReportRecord;
+                                          RegRec: PExceptionRegistrationRecord;
+                                          Context: PContextRecord;
+                                          DispContext: pointer): cardinal;
+                                                                         cdecl;
 
             TExceptionRegistrationRecord=record
                 Prev_Structure:PExceptionRegistrationRecord;