paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-11-13 02:59:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* Fixed SExceptionErrorMessage, it was missing format placeholder.

git-svn-id: trunk@19787 -
This commit is contained in:
sergei 2011-12-09 14:52:26 +00:00
parent f7da4a210c
commit 3b904943e7
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rtl/inc/systemh.inc
View File

@ -1184,6 +1184,10 @@ const
AbstractErrorProc : TAbstractErrorProc = nil; AbstractErrorProc : TAbstractErrorProc = nil;
AssertErrorProc : TAssertErrorProc = @SysAssert; AssertErrorProc : TAssertErrorProc = @SysAssert;
SafeCallErrorProc : TSafeCallErrorProc = nil; 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 SetJmp/LongJmp

4
rtl/objpas/objpas.pp
View File

@ -52,10 +52,6 @@ unit objpas;
Var Var
ExceptionClass: TClass; { Exception base class (must actually be Exception, defined in sysutils ) } ExceptionClass: TClass; { Exception base class (must actually be Exception, defined in sysutils ) }
{$endif FPC_HAS_FEATURE_CLASSES} {$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. Compatibility routines.

2
rtl/objpas/sysconst.pp
View File

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