Browse Source

+ Made sure it compiles with official 0.99.8

michael 27 years ago
parent
commit
cf6ce49cb1
2 changed files with 24 additions and 7 deletions
  1. 12 4
      rtl/objpas/sysstr.inc
  2. 12 3
      rtl/objpas/sysutils.pp

+ 12 - 4
rtl/objpas/sysstr.inc

@@ -429,9 +429,11 @@ end ;
 {   FmtLoadStr returns the string resource Ident and formats it accordingly   }
 
 
+{$ifdef autoobjpas}
 function FmtLoadStr(Ident: integer; const Args: array of const): string;
 begin
 end;
+{$endif}
 
 Const
   feInvalidFormat   = 1;
@@ -453,7 +455,7 @@ begin
   Halt(1);
 end;
 
-
+{$ifdef AUTOOBJPAS}
 Function Format (Const Fmt : String; const Args : Array of const) : String;
 
 Var ChPos,OldPos,ArgPos,DoArg,Len : Longint;
@@ -691,7 +693,7 @@ begin
     Oldpos:=chpos;
     end;
 end;
-
+{$endif}
 
 {==============================================================================}
 {   extra functions                                                            }
@@ -887,7 +889,10 @@ end ;
 
 {
   $Log$
-  Revision 1.6  1998-10-02 10:42:17  michael
+  Revision 1.7  1998-10-02 12:17:17  michael
+  + Made sure it compiles with official 0.99.8
+
+  Revision 1.6  1998/10/02 10:42:17  michael
   + Initial implementation of format
 
   Revision 1.5  1998/10/01 16:05:37  michael
@@ -904,7 +909,10 @@ end ;
   Update from gertjan Schouten, plus small fix for linux
 
   $Log$
-  Revision 1.6  1998-10-02 10:42:17  michael
+  Revision 1.7  1998-10-02 12:17:17  michael
+  + Made sure it compiles with official 0.99.8
+
+  Revision 1.6  1998/10/02 10:42:17  michael
   + Initial implementation of format
 
   Revision 1.5  1998/10/01 16:05:37  michael

+ 12 - 3
rtl/objpas/sysutils.pp

@@ -54,7 +54,9 @@ interface
           fhelpcontext : longint;
         public
           constructor create(const msg : string);
+{$ifdef autoobjpas}
           constructor createfmt(const msg : string; const args : array of const);
+{$endif}          
           constructor createres(ident : longint);
           { !!!! }
           property helpcontext : longint read fhelpcontext write fhelpcontext;
@@ -141,14 +143,14 @@ interface
          {!!!!!}
       end;
 
-
+{$ifdef autoobjpas}
     constructor exception.createfmt(const msg : string; const args : array of const);
 
       begin
          inherited create;
          fmessage:=Format(msg,args);
       end;
-
+{$endif}
 
     constructor exception.createres(ident : longint);
 
@@ -205,7 +207,11 @@ begin
      EInoutError(E).ErrorCode:=IOresult; // Clears InOutRes !!
      end;
   else
+{$ifdef autoobjpas}
    E:=Exception.CreateFmt (SUnKnownRunTimeError,[Errno]);
+{$else}
+   E:=Exception.Create(SUnknownRunTimeError);
+{$endif}
   end;
   Raise E {at Address};
 end;
@@ -231,7 +237,10 @@ begin
 end.
 {
     $Log$
-    Revision 1.11  1998-10-01 16:04:11  michael
+    Revision 1.12  1998-10-02 12:17:18  michael
+    + Made sure it compiles with official 0.99.8
+
+    Revision 1.11  1998/10/01 16:04:11  michael
     + Added RTL error handling
 
     Revision 1.10  1998/09/24 23:45:27  peter