Applied fixes for Free Pascal and newer Delphi versions

taoxuau · Jan 22, 2016 · 0987f31 · 0987f31
1 parent 11c1e1a
commit 0987f31
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/src/Log4D.pas b/src/Log4D.pas
@@ -61,7 +61,7 @@ interface
 {$ELSE}
   Windows,
 {$ENDIF}
-{$IFDEF DELPHI5_UP}
+{$IFDEF HAS_UNIT_CONTNRS}
   Contnrs,
 {$ENDIF}
   SysUtils;
@@ -1873,9 +1873,14 @@ procedure TLogRoot.SetLevel(const Level: TLogLevel);
 
 { Initialise internal logging - send it to debugging output. }
 constructor TLogLog.Create;
+// fix for Free Pascal by M Justin: use a variable
+var
+  TmpAppender: ILogAppender;
 begin
   inherited Create('');
-  AddAppender(TLogODSAppender.Create(''));
+
+  TmpAppender := TLogODSAppender.Create('');
+  AddAppender(TmpAppender);
   InternalDebugging := False;
   Level             := Log4D.Debug;
 end;
@@ -2203,7 +2208,10 @@ function TLogCustomLayout.IgnoresException: Boolean;
 procedure TLogCustomLayout.Init;
 begin
   inherited Init;
-  SetOption(DateFormatOpt, ShortDateFormat);
+  SetOption(DateFormatOpt,
+    {$IFDEF DELPHIXE_UP}FormatSettings.{$ENDIF}
+    {$IFDEF FPC}FormatSettings.{$ENDIF}
+    ShortDateFormat);
 end;
 
 { Set a list of options for this layout. }