* Moved ExceptObjProc from objpas to system, because it is going to be called from system. Also added ExceptClsProc variable.

* Fixed SExceptionErrorMessage, it was missing format placeholder.

git-svn-id: trunk@19787 -

rtl/inc/systemh.inc

@@ -1184,6 +1184,10 @@ const
   AbstractErrorProc : TAbstractErrorProc = nil;
   AssertErrorProc   : TAssertErrorProc = @SysAssert;
   SafeCallErrorProc : TSafeCallErrorProc = nil;
+{$ifdef FPC_HAS_FEATURE_EXCEPTIONS}
+  ExceptObjProc     : Pointer = nil; { Used to convert OS exceptions to FPC exceptions. }
+  ExceptClsProc     : Pointer = nil;
+{$endif FPC_HAS_FEATURE_EXCEPTIONS}
 
 {*****************************************************************************
                           SetJmp/LongJmp

rtl/objpas/objpas.pp

@@ -52,10 +52,6 @@ unit objpas;
 Var
    ExceptionClass: TClass; { Exception base class (must actually be Exception, defined in sysutils ) }
 {$endif FPC_HAS_FEATURE_CLASSES}
-{$ifdef FPC_HAS_FEATURE_EXCEPTIONS}
-Var
-   ExceptObjProc: Pointer; { Used to convert OS exceptions to exceptions in Delphi. Unused in FPC}
-{$endif FPC_HAS_FEATURE_EXCEPTIONS}
 
 {****************************************************************************
                              Compatibility routines.

rtl/objpas/sysconst.pp

@@ -45,7 +45,7 @@ resourcestring
   SInvalidJulianDate            = '%f Julian cannot be represented as a DateTime';
   SErrIllegalDateFormatString   = '"%s" is not a valid date format string';
   SErrInvalidTimeFormat  = '"%s" is not a valid time';
-  SExceptionErrorMessage = 'exception at %p';
+  SExceptionErrorMessage = 'Exception at %p: %s';
   SExceptionStack        = 'Exception stack error';
   SExecuteProcessFailed  = 'Failed to execute "%s", error code: %d';
   SExternalException     = 'External exception %x';