Преглед изворни кода

* avoid platform specific ifdefs in eventlog.pp and allow OS/2 implementation being used again

git-svn-id: trunk@12204 -
Tomas Hajny пре 16 година
родитељ
комит
8de51a03cb

+ 1 - 1
.gitattributes

@@ -1101,8 +1101,8 @@ packages/fcl-base/src/cachecls.pp svneol=native#text/plain
 packages/fcl-base/src/contnrs.pp svneol=native#text/plain
 packages/fcl-base/src/custapp.pp svneol=native#text/plain
 packages/fcl-base/src/daemonapp.pp svneol=native#text/plain
+packages/fcl-base/src/dummy/eventlog.inc svneol=native#text/plain
 packages/fcl-base/src/eventlog.pp svneol=native#text/plain
-packages/fcl-base/src/felog.inc svneol=native#text/plain
 packages/fcl-base/src/fpexprpars.pp svneol=native#text/plain
 packages/fcl-base/src/fptimer.pp svneol=native#text/plain
 packages/fcl-base/src/gettext.pp svneol=native#text/plain

+ 1 - 0
packages/fcl-base/Makefile.fpc

@@ -49,6 +49,7 @@ includedir_win32=src/win
 includedir_win64=src/win
 includedir_wince=src/win
 sourcedir=src/$(OS_TARGET) src
+includedir_linux=src/dummy
 
 [prerules]
 ifeq ($(OS_TARGET),win32)

+ 3 - 3
packages/fcl-base/fpmake.pp

@@ -21,7 +21,7 @@ begin
 
     P.Author := '<various>';
     P.License := 'LGPL with modification, ';
-    P.HomepageURL := 'www.freepascal.org';
+    P.ExternalURL := 'www.freepascal.org';
     P.Email := '';
     P.Description := 'Base library of Free Component Libraries(FCL), FPC''s OOP library.';
     P.NeedLibC:= false;
@@ -34,6 +34,7 @@ begin
     P.IncludePath.Add('src/unix',AllUnixOSes);
     P.IncludePath.Add('src/win',AllWindowsOSes);
     P.IncludePath.Add('src/$(OS)',AllOSes-AllWindowsOSes-AllUnixOSes);
+    P.IncludePath.Add('src/dummy',AllOSes);
 
     T:=P.Targets.AddUnit('avl_tree.pp');
     T:=P.Targets.AddUnit('base64.pp');
@@ -55,8 +56,7 @@ begin
       T.ResourceStrings:=true;
       with T.Dependencies do
         begin
-          AddInclude('eventlog.inc',AllUnixOSes+[Win32,Win64]);
-          AddInclude('felog.inc',AllOSes-AllUnixOSes-[Win32,Win64]);
+          AddInclude('eventlog.inc');
         end;
     T:=P.Targets.AddUnit('fptimer.pp',AllWindowsOSes+AllUnixOSes);
     T:=P.Targets.AddUnit('gettext.pp');

+ 0 - 0
packages/fcl-base/src/felog.inc → packages/fcl-base/src/dummy/eventlog.inc


+ 3 - 5
packages/fcl-base/src/eventlog.pp

@@ -111,11 +111,9 @@ Resourcestring
 
 implementation
 
-{$if defined(win32) or defined(win64) or defined(unix)}
- {$i eventlog.inc}
-{$else}
- {$i felog.inc}
-{$endif}
+{$i eventlog.inc}
+(* File based dummy implementation is used for all platforms not providing
+   specific implementation of eventlog.inc for the particular platform. *)
 
 { TEventLog }