- removed PARAOUTFILE define and ifdefs

git-svn-id: trunk@12898 -
This commit is contained in:
Jonas Maebe 2009-03-15 12:31:02 +00:00
parent a8eb1cc30b
commit ab8b32dafb
5 changed files with 18 additions and 19 deletions

View File

@ -2358,7 +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('PARAOUTFILE');
def_system_macro('RESSTRSECTIONS');
def_system_macro('FPC_HASFIXED64BITVARIANT');
def_system_macro('FPC_HASINTERNALOLEVARIANT2VARIANTCAST');

View File

@ -18,7 +18,7 @@
type
UnTypedFile=File;
Procedure Assign({$ifdef PARAOUTFILE}out{$else}var{$endif} f:File;const Name:string);
Procedure Assign(out f:File;const Name:string);
{
Assign Name to file f so it can be used with the file routines
}
@ -30,7 +30,7 @@ Begin
End;
Procedure Assign({$ifdef PARAOUTFILE}out{$else}var{$endif} f:File;p:pchar);
Procedure Assign(out f:File;p:pchar);
{
Assign Name to file f so it can be used with the file routines
}
@ -39,7 +39,7 @@ begin
end;
Procedure Assign({$ifdef PARAOUTFILE}out{$else}var{$endif} f:File;c:char);
Procedure Assign(out f:File;c:char);
{
Assign Name to file f so it can be used with the file routines
}

View File

@ -792,9 +792,9 @@ function lowercase(const s : ansistring) : ansistring;
****************************************************************************}
{$ifdef FPC_HAS_FEATURE_FILEIO}
Procedure Assign({$ifdef PARAOUTFILE}out{$else}var{$endif} f:File;const Name:string);
Procedure Assign({$ifdef PARAOUTFILE}out{$else}var{$endif} f:File;p:pchar);
Procedure Assign({$ifdef PARAOUTFILE}out{$else}var{$endif} f:File;c:char);
Procedure Assign(out f:File;const Name:string);
Procedure Assign(out f:File;p:pchar);
Procedure Assign(out f:File;c:char);
Procedure Rewrite(var f:File;l:Longint);
Procedure Rewrite(var f:File);
Procedure Reset(var f:File;l:Longint);
@ -829,9 +829,9 @@ Procedure Truncate (var F:File);
****************************************************************************}
{$ifdef FPC_HAS_FEATURE_FILEIO}
Procedure Assign({$ifdef PARAOUTFILE}out{$else}var{$endif} f:TypedFile;const Name:string);
Procedure Assign({$ifdef PARAOUTFILE}out{$else}var{$endif} f:TypedFile;p:pchar);
Procedure Assign({$ifdef PARAOUTFILE}out{$else}var{$endif} f:TypedFile;c:char);
Procedure Assign(out f:TypedFile;const Name:string);
Procedure Assign(out f:TypedFile;p:pchar);
Procedure Assign(out f:TypedFile;c:char);
Procedure Reset(var f : TypedFile); [INTERNPROC: fpc_in_Reset_TypedFile];
Procedure Rewrite(var f : TypedFile); [INTERNPROC: fpc_in_Rewrite_TypedFile];
{$endif FPC_HAS_FEATURE_FILEIO}
@ -841,9 +841,9 @@ Procedure Rewrite(var f : TypedFile); [INTERNPROC: fpc_in_Rewrite_TypedFile];
****************************************************************************}
{$ifdef FPC_HAS_FEATURE_TEXTIO}
Procedure Assign({$ifdef PARAOUTFILE}out{$else}var{$endif} t:Text;const s:string);
Procedure Assign({$ifdef PARAOUTFILE}out{$else}var{$endif} t:Text;p:pchar);
Procedure Assign({$ifdef PARAOUTFILE}out{$else}var{$endif} t:Text;c:char);
Procedure Assign(out t:Text;const s:string);
Procedure Assign(out t:Text;p:pchar);
Procedure Assign(out t:Text;c:char);
Procedure Close(var t:Text);
Procedure Rewrite(var t:Text);
Procedure Reset(var t:Text);

View File

@ -75,7 +75,7 @@ Begin
End;
Procedure Assign({$ifdef PARAOUTFILE}out{$else}var{$endif} t:Text;const s:String);
Procedure Assign(out t:Text;const s:String);
Begin
FillChar(t,SizeOf(TextRec),0);
{ only set things that are not zero }
@ -93,13 +93,13 @@ Begin
End;
Procedure Assign({$ifdef PARAOUTFILE}out{$else}var{$endif} t:Text;p:pchar);
Procedure Assign(out t:Text;p:pchar);
begin
Assign(t,StrPas(p));
end;
Procedure Assign({$ifdef PARAOUTFILE}out{$else}var{$endif} t:Text;c:char);
Procedure Assign(out t:Text;c:char);
begin
Assign(t,string(c));
end;

View File

@ -15,7 +15,7 @@
subroutines for typed file handling
****************************************************************************}
Procedure Assign({$ifdef PARAOUTFILE}out{$else}var{$endif} f:TypedFile;const Name:string);
Procedure Assign(out f:TypedFile;const Name:string);
{
Assign Name to file f so it can be used with the file routines
}
@ -27,7 +27,7 @@ Begin
End;
Procedure Assign({$ifdef PARAOUTFILE}out{$else}var{$endif} f:TypedFile;p:pchar);
Procedure Assign(out f:TypedFile;p:pchar);
{
Assign Name to file f so it can be used with the file routines
}
@ -36,7 +36,7 @@ begin
end;
Procedure Assign({$ifdef PARAOUTFILE}out{$else}var{$endif} f:TypedFile;c:char);
Procedure Assign(out f:TypedFile;c:char);
{
Assign Name to file f so it can be used with the file routines
}