Skip to content
Permalink
Browse files

fixed FPC i386 compilation

  • Loading branch information...
Arnaud Bouchez
Arnaud Bouchez committed Jul 19, 2019
1 parent 05ababb commit 809b11cb871708222cd7a969703efac64561fa3f
Showing with 62 additions and 71 deletions.
  1. +2 −1 SQLite3/mORMotHttpClient.pas
  2. +2 −2 SynBidirSock.pas
  3. +44 −61 SynCommons.pas
  4. +9 −4 SynDBZeos.pas
  5. +2 −2 SynMongoDB.pas
  6. +2 −0 Synopse.inc
  7. +1 −1 SynopseCommit.inc
@@ -433,6 +433,7 @@ TSQLHttpClientRequest = class(TSQLHttpClientGeneric)
read fExtendedOptions.Auth.Password write fExtendedOptions.Auth.Password;
end;

/// meta-class of TSQLHttpClientRequest types
TSQLHttpClientRequestClass = class of TSQLHttpClientRequest;

{$ifdef USEWININET}
@@ -662,7 +663,7 @@ constructor TSQLHttpClientGeneric.Create(const aServer: TSQLRestServerURIString;
URI.URI := aServer;
if URI.Root<>'' then
aModel.Root := URI.Root;
if URI.Port='' then
if (URI.Port='') and (aDefaultPort<>0) then
URI.Port := Int32ToUtf8(aDefaultPort);
Create(SockString(URI.Address),SockString(URI.Port),aModel,aHttps);
end;
@@ -2551,7 +2551,7 @@ function TWebCrtSocketProcess.GetFrame(out Frame: TWebSocketFrame;
fSocket.SockInRead(@hdr.len32,8,false);
if hdr.len32<>0 then // size is more than 32 bits -> reject
hdr.len32 := maxInt else
hdr.len32 := {$ifdef FPC}SwapEndian{$else}bswap32{$endif}(hdr.len64);
hdr.len32 := bswap32(hdr.len64);
if hdr.len32>WebSocketsMaxFrameMB shl 20 then
raise EWebSockets.CreateUTF8('%.GetFrame: length should be < % MB',
[self,WebSocketsMaxFrameMB]);
@@ -2647,7 +2647,7 @@ function TWebCrtSocketProcess.SendFrame(var Frame: TWebSocketFrame): boolean;
fSocket.SockSend(@hdr,4);
end else begin
hdr.len8 := FRAME_LEN8BYTES or fMaskSentFrames;
hdr.len64 := {$ifdef FPC}SwapEndian{$else}bswap32{$endif}(len);
hdr.len64 := bswap32(len);
hdr.len32 := 0;
// huge payload sent outside TCrtSock buffers
if not fSocket.TrySndLow(@hdr,10+fMaskSentFrames shr 5) or

0 comments on commit 809b11c

Please sign in to comment.
You can’t perform that action at this time.