Browse Source

* moved the morphos code for exeinfo.GetModuleByAddr to a separate ifdef section

git-svn-id: trunk@39054 -
nickysn 7 years ago
parent
commit
443980b7ac
1 changed files with 11 additions and 5 deletions
  1. 11 5
      rtl/inc/exeinfo.pp

+ 11 - 5
rtl/inc/exeinfo.pp

@@ -103,19 +103,25 @@ uses
         end;
         end;
     end;
     end;
 
 
-{$else}
+{$elseif defined(morphos)}
 
 
-{$ifdef morphos}
   procedure startsymbol; external name '_start';
   procedure startsymbol; external name '_start';
-{$endif}
 
 
   procedure GetModuleByAddr(addr: pointer; var baseaddr: pointer; var filename: string);
   procedure GetModuleByAddr(addr: pointer; var baseaddr: pointer; var filename: string);
     begin
     begin
-{$ifdef morphos}
       baseaddr:= @startsymbol;
       baseaddr:= @startsymbol;
+{$ifdef FPC_HAS_FEATURE_COMMANDARGS}
+      filename:=ParamStr(0);
+{$else FPC_HAS_FEATURE_COMMANDARGS}
+      filename:='';
+{$endif FPC_HAS_FEATURE_COMMANDARGS}
+    end;
+
 {$else}
 {$else}
+
+  procedure GetModuleByAddr(addr: pointer; var baseaddr: pointer; var filename: string);
+    begin
       baseaddr:= nil;
       baseaddr:= nil;
-{$endif}
 {$ifdef FPC_HAS_FEATURE_COMMANDARGS}
 {$ifdef FPC_HAS_FEATURE_COMMANDARGS}
       filename:=ParamStr(0);
       filename:=ParamStr(0);
 {$else FPC_HAS_FEATURE_COMMANDARGS}
 {$else FPC_HAS_FEATURE_COMMANDARGS}