paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-14 04:19:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

- removed FPC_DARWIN_JMP_MAIN and FPC_DARWIN_PASCALMAIN defines and ifdefs

Browse Source 
git-svn-id: trunk@12897 -
This commit is contained in:
Jonas Maebe 2009-03-15 12:21:59 +00:00
parent c6470a75e7
commit a8eb1cc30b
2 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/options.pas
View File

@ -2358,8 +2358,6 @@ begin
{ Temporary defines, until things settle down }
{ "main" symbol is generated in the main program, and left out of the system unit }
def_system_macro('FPC_DARWIN_PASCALMAIN');
def_system_macro('FPC_DARWIN_JMP_MAIN');
def_system_macro('PARAOUTFILE');
def_system_macro('RESSTRSECTIONS');
def_system_macro('FPC_HASFIXED64BITVARIANT');

15
rtl/bsd/system.pp
View File

@ -1,5 +1,5 @@
{
This file is part of the Free Pascal run time librar~y.
This file is part of the Free Pascal run time library.
Copyright (c) 2000 by Marco van de Voort
member of the Free Pascal development team.
@ -266,18 +266,9 @@ end;
{$ifdef Darwin}
{$ifndef FPC_DARWIN_PASCALMAIN}
procedure pascalmain;external name 'PASCALMAIN';
{ Main entry point in C style, needed to capture program parameters. }
procedure main(argcparam: Longint; argvparam: ppchar; envpparam: ppchar); cdecl; [public];
{$else FPC_DARWIN_PASCALMAIN}
{$ifdef FPC_DARWIN_JMP_MAIN}
procedure pascalmain;cdecl;external name 'PASCALMAIN';
{$endif}
procedure FPC_SYSTEMMAIN(argcparam: Longint; argvparam: ppchar; envpparam: ppchar); cdecl; [public];
{$endif FPC_DARWIN_PASCALMAIN}
begin
argc:= argcparam;
@ -286,9 +277,7 @@ begin
{$ifdef cpui386}
Set8087CW(Default8087CW);
{$endif cpui386}
{$if not defined(FPC_DARWIN_PASCALMAIN) or defined(FPC_DARWIN_JMP_MAIN)}
pascalmain; {run the pascal main program}
{$endif}
end;
{$endif Darwin}
{$endif FPC_USE_LIBC}