Browse Source

* FIx compilation for platforms that do not have extended

git-svn-id: trunk@42048 -
michael 6 years ago
parent
commit
58f1a8513b
2 changed files with 17 additions and 4 deletions
  1. 8 4
      rtl/objpas/classes/classesh.inc
  2. 9 0
      rtl/objpas/classes/streams.inc

+ 8 - 4
rtl/objpas/classes/classesh.inc

@@ -938,11 +938,12 @@ type
     function ReadData(var Buffer: Single; Count: NativeInt): NativeInt; overload;
     function ReadData(var Buffer: Single; Count: NativeInt): NativeInt; overload;
     function ReadData(var Buffer: Double): NativeInt; overload;
     function ReadData(var Buffer: Double): NativeInt; overload;
     function ReadData(var Buffer: Double; Count: NativeInt): NativeInt; overload;
     function ReadData(var Buffer: Double; Count: NativeInt): NativeInt; overload;
+{$IFDEF FPC_HAS_TYPE_EXTENDED}
     function ReadData(var Buffer: Extended): NativeInt; overload;
     function ReadData(var Buffer: Extended): NativeInt; overload;
     function ReadData(var Buffer: Extended; Count: NativeInt): NativeInt; overload;
     function ReadData(var Buffer: Extended; Count: NativeInt): NativeInt; overload;
     function ReadData(var Buffer: TExtended80Rec): NativeInt; overload;
     function ReadData(var Buffer: TExtended80Rec): NativeInt; overload;
     function ReadData(var Buffer: TExtended80Rec; Count: NativeInt): NativeInt; overload;
     function ReadData(var Buffer: TExtended80Rec; Count: NativeInt): NativeInt; overload;
-
+{$ENDIF}
     procedure ReadBuffer(var Buffer; Count: Longint);
     procedure ReadBuffer(var Buffer; Count: Longint);
     procedure ReadBuffer(var Buffer: TBytes; Count: NativeInt); overload;
     procedure ReadBuffer(var Buffer: TBytes; Count: NativeInt); overload;
     procedure ReadBuffer(var Buffer: TBytes; Offset, Count: NativeInt); overload;
     procedure ReadBuffer(var Buffer: TBytes; Offset, Count: NativeInt); overload;
@@ -973,11 +974,12 @@ type
     procedure ReadBufferData(var Buffer: Single; Count: NativeInt); overload;
     procedure ReadBufferData(var Buffer: Single; Count: NativeInt); overload;
     procedure ReadBufferData(var Buffer: Double); overload;
     procedure ReadBufferData(var Buffer: Double); overload;
     procedure ReadBufferData(var Buffer: Double; Count: NativeInt); overload;
     procedure ReadBufferData(var Buffer: Double; Count: NativeInt); overload;
+{$IFDEF FPC_HAS_TYPE_EXTENDED}
     procedure ReadBufferData(var Buffer: Extended); overload;
     procedure ReadBufferData(var Buffer: Extended); overload;
     procedure ReadBufferData(var Buffer: Extended; Count: NativeInt); overload;
     procedure ReadBufferData(var Buffer: Extended; Count: NativeInt); overload;
     procedure ReadBufferData(var Buffer: TExtended80Rec); overload;
     procedure ReadBufferData(var Buffer: TExtended80Rec); overload;
     procedure ReadBufferData(var Buffer: TExtended80Rec; Count: NativeInt); overload;
     procedure ReadBufferData(var Buffer: TExtended80Rec; Count: NativeInt); overload;
-
+{$ENDIF}
     procedure WriteBuffer(const Buffer; Count: Longint);
     procedure WriteBuffer(const Buffer; Count: Longint);
     procedure WriteBuffer(const Buffer: TBytes; Count: NativeInt); overload;
     procedure WriteBuffer(const Buffer: TBytes; Count: NativeInt); overload;
     procedure WriteBuffer(const Buffer: TBytes; Offset, Count: NativeInt); overload;
     procedure WriteBuffer(const Buffer: TBytes; Offset, Count: NativeInt); overload;
@@ -1010,11 +1012,12 @@ type
     function WriteData(const Buffer: Single; Count: NativeInt): NativeInt; overload;
     function WriteData(const Buffer: Single; Count: NativeInt): NativeInt; overload;
     function WriteData(const Buffer: Double): NativeInt; overload;
     function WriteData(const Buffer: Double): NativeInt; overload;
     function WriteData(const Buffer: Double; Count: NativeInt): NativeInt; overload;
     function WriteData(const Buffer: Double; Count: NativeInt): NativeInt; overload;
+{$IFDEF FPC_HAS_TYPE_EXTENDED}
     function WriteData(const Buffer: Extended): NativeInt; overload;
     function WriteData(const Buffer: Extended): NativeInt; overload;
     function WriteData(const Buffer: Extended; Count: NativeInt): NativeInt; overload;
     function WriteData(const Buffer: Extended; Count: NativeInt): NativeInt; overload;
     function WriteData(const Buffer: TExtended80Rec): NativeInt; overload;
     function WriteData(const Buffer: TExtended80Rec): NativeInt; overload;
     function WriteData(const Buffer: TExtended80Rec; Count: NativeInt): NativeInt; overload;
     function WriteData(const Buffer: TExtended80Rec; Count: NativeInt): NativeInt; overload;
-
+{$ENDIF}
     procedure WriteBufferData(Buffer: Integer); overload;
     procedure WriteBufferData(Buffer: Integer); overload;
     procedure WriteBufferData(Buffer: Integer; Count: NativeInt); overload;
     procedure WriteBufferData(Buffer: Integer; Count: NativeInt); overload;
     procedure WriteBufferData(Buffer: Boolean); overload;
     procedure WriteBufferData(Buffer: Boolean); overload;
@@ -1041,11 +1044,12 @@ type
     procedure WriteBufferData(Buffer: Single; Count: NativeInt); overload;
     procedure WriteBufferData(Buffer: Single; Count: NativeInt); overload;
     procedure WriteBufferData(Buffer: Double); overload;
     procedure WriteBufferData(Buffer: Double); overload;
     procedure WriteBufferData(Buffer: Double; Count: NativeInt); overload;
     procedure WriteBufferData(Buffer: Double; Count: NativeInt); overload;
+{$IFDEF FPC_HAS_TYPE_EXTENDED}
     procedure WriteBufferData(Buffer: Extended); overload;
     procedure WriteBufferData(Buffer: Extended); overload;
     procedure WriteBufferData(Buffer: Extended; Count: NativeInt); overload;
     procedure WriteBufferData(Buffer: Extended; Count: NativeInt); overload;
     procedure WriteBufferData(Buffer: TExtended80Rec); overload;
     procedure WriteBufferData(Buffer: TExtended80Rec); overload;
     procedure WriteBufferData(Buffer: TExtended80Rec; Count: NativeInt); overload;
     procedure WriteBufferData(Buffer: TExtended80Rec; Count: NativeInt); overload;
-
+{$ENDIF}
     function CopyFrom(Source: TStream; Count: Int64): Int64;
     function CopyFrom(Source: TStream; Count: Int64): Int64;
     function ReadComponent(Instance: TComponent): TComponent;
     function ReadComponent(Instance: TComponent): TComponent;
     function ReadComponentRes(Instance: TComponent): TComponent;
     function ReadComponentRes(Instance: TComponent): TComponent;

+ 9 - 0
rtl/objpas/classes/streams.inc

@@ -382,6 +382,7 @@ begin
   Result:=ReadMaxSizeData(Buffer,SizeOf(Buffer),Count);
   Result:=ReadMaxSizeData(Buffer,SizeOf(Buffer),Count);
 end;
 end;
 
 
+{$IFDEF FPC_HAS_TYPE_EXTENDED}
 function TStream.ReadData(var Buffer: Extended): NativeInt;
 function TStream.ReadData(var Buffer: Extended): NativeInt;
 begin
 begin
   Result:=Read(Buffer,sizeOf(Buffer));
   Result:=Read(Buffer,sizeOf(Buffer));
@@ -401,6 +402,7 @@ function TStream.ReadData(var Buffer: TExtended80Rec; Count: NativeInt): NativeI
 begin
 begin
   Result:=ReadMaxSizeData(Buffer,SizeOf(Buffer),Count);
   Result:=ReadMaxSizeData(Buffer,SizeOf(Buffer),Count);
 end;
 end;
+{$ENDIF}
 
 
 procedure TStream.ReadBuffer(var Buffer; Count: Longint);
 procedure TStream.ReadBuffer(var Buffer; Count: Longint);
 
 
@@ -557,6 +559,7 @@ begin
   ReadExactSizeData(Buffer,SizeOf(Buffer),Count);
   ReadExactSizeData(Buffer,SizeOf(Buffer),Count);
 end;
 end;
 
 
+{$IFDEF FPC_HAS_TYPE_EXTENDED}
 procedure TStream.ReadBufferData(var Buffer: Extended);
 procedure TStream.ReadBufferData(var Buffer: Extended);
 begin
 begin
   ReadBuffer(Buffer,SizeOf(Buffer));
   ReadBuffer(Buffer,SizeOf(Buffer));
@@ -576,6 +579,7 @@ procedure TStream.ReadBufferData(var Buffer: TExtended80Rec; Count: NativeInt);
 begin
 begin
   ReadExactSizeData(Buffer,SizeOf(Buffer),Count);
   ReadExactSizeData(Buffer,SizeOf(Buffer),Count);
 end;
 end;
+{$ENDIF}
 
 
 procedure TStream.WriteBuffer(const Buffer; Count: Longint);
 procedure TStream.WriteBuffer(const Buffer; Count: Longint);
 
 
@@ -742,6 +746,7 @@ begin
   Result:=WriteMaxSizeData(Buffer,SizeOf(Buffer),Count);
   Result:=WriteMaxSizeData(Buffer,SizeOf(Buffer),Count);
 end;
 end;
 
 
+{$IFDEF FPC_HAS_TYPE_EXTENDED}
 function TStream.WriteData(const Buffer: Extended): NativeInt;
 function TStream.WriteData(const Buffer: Extended): NativeInt;
 begin
 begin
   Result:=Write(Buffer,SizeOf(Buffer));
   Result:=Write(Buffer,SizeOf(Buffer));
@@ -761,6 +766,7 @@ function TStream.WriteData(const Buffer: TExtended80Rec; Count: NativeInt): Nati
 begin
 begin
   Result:=WriteMaxSizeData(Buffer,SizeOf(Buffer),Count);
   Result:=WriteMaxSizeData(Buffer,SizeOf(Buffer),Count);
 end;
 end;
+{$ENDIF}
 
 
 procedure TStream.WriteBufferData(Buffer: Integer);
 procedure TStream.WriteBufferData(Buffer: Integer);
 begin
 begin
@@ -892,6 +898,8 @@ begin
   WriteExactSizeData(Buffer,SizeOf(Buffer),Count);
   WriteExactSizeData(Buffer,SizeOf(Buffer),Count);
 end;
 end;
 
 
+
+{$IFDEF FPC_HAS_TYPE_EXTENDED}
 procedure TStream.WriteBufferData(Buffer: Extended);
 procedure TStream.WriteBufferData(Buffer: Extended);
 begin
 begin
   WriteBuffer(Buffer,SizeOf(Buffer));
   WriteBuffer(Buffer,SizeOf(Buffer));
@@ -911,6 +919,7 @@ procedure TStream.WriteBufferData(Buffer: TExtended80Rec; Count: NativeInt);
 begin
 begin
   WriteExactSizeData(Buffer,SizeOf(Buffer),Count);
   WriteExactSizeData(Buffer,SizeOf(Buffer),Count);
 end;
 end;
+{$ENDIF}
 
 
   function TStream.CopyFrom(Source: TStream; Count: Int64): Int64;
   function TStream.CopyFrom(Source: TStream; Count: Int64): Int64;