Browse Source

* Fixed warnings. rtl is warnings and notes free for wince and win32 again.

git-svn-id: trunk@10632 -
yury 17 years ago
parent
commit
62e616cae0

+ 1 - 1
rtl/inc/macpas.pp

@@ -293,7 +293,7 @@ end;
 
 procedure BSet(var i: cardinal; j: cardinal); {$ifdef systeminline}inline;{$endif}
 begin
-  i := i or (1 shl j);
+  i := i or (cardinal(1) shl j);
 end;
 
 procedure BSet(var i: int64; j: cardinal); {$ifdef systeminline}inline;{$endif}

+ 6 - 6
rtl/inc/sockets.inc

@@ -235,9 +235,9 @@ begin
   htonl:=host;
 {$else}
   htonl:=THostAddr(host)[4];
-  htonl:=htonl or ( (THostAddr(host)[3]) shl 8);
-  htonl:=htonl or ( (THostAddr(host)[2]) shl 16);
-  htonl:=htonl or ( (THostAddr(host)[1]) shl 24);
+  htonl:=htonl or longint( (THostAddr(host)[3]) shl 8);
+  htonl:=htonl or longint( (THostAddr(host)[2]) shl 16);
+  htonl:=htonl or longint( (THostAddr(host)[1]) shl 24);
 {$endif}
 end;
 
@@ -248,9 +248,9 @@ begin
   ntohl:=net;
 {$else}
   ntohl:=THostAddr(Net)[4];
-  ntohl:=ntohl or ( (THostAddr(Net)[3]) shl 8);
-  ntohl:=ntohl or ( (THostAddr(Net)[2]) shl 16);
-  ntohl:=ntohl or ( (THostAddr(Net)[1]) shl 24);
+  ntohl:=ntohl or longint( (THostAddr(Net)[3]) shl 8);
+  ntohl:=ntohl or longint( (THostAddr(Net)[2]) shl 16);
+  ntohl:=ntohl or longint( (THostAddr(Net)[1]) shl 24);
 {$endif}
 end;
 

+ 2 - 2
rtl/objpas/classes/bits.inc

@@ -167,7 +167,7 @@ var
 begin
    n := bit shr BITSHIFT;
    grow(bit);
-   FBits^[n] := FBits^[n] or (longint(1) shl (bit and MASK));
+   FBits^[n] := FBits^[n] or (cardinal(1) shl (bit and MASK));
    if bit >= FBSize then FBSize := bit;
 end;
 
@@ -223,7 +223,7 @@ end;
 procedure TBits.notbits(bitset : TBits);
 var
    n : longint;
-   jj : longint;
+   jj : cardinal;
    loop : longint;
 begin
    if FSize < bitset.getFSize then

+ 4 - 4
rtl/objpas/strutils.pp

@@ -31,7 +31,7 @@ Function AnsiContainsText(const AText, ASubText: string): Boolean;
 Function AnsiStartsText(const ASubText, AText: string): Boolean;inline;
 Function AnsiEndsText(const ASubText, AText: string): Boolean;inline;
 Function AnsiReplaceText(const AText, AFromText, AToText: string): string;inline;
-Function AnsiMatchText(const AText: string; const AValues: array of string): Boolean;inline;
+Function AnsiMatchText(const AText: string; const AValues: array of string): Boolean;
 Function AnsiIndexText(const AText: string; const AValues: array of string): Integer;
 
 { ---------------------------------------------------------------------
@@ -42,7 +42,7 @@ Function AnsiContainsStr(const AText, ASubText: string): Boolean;inline;
 Function AnsiStartsStr(const ASubText, AText: string): Boolean;inline;
 Function AnsiEndsStr(const ASubText, AText: string): Boolean;inline;
 Function AnsiReplaceStr(const AText, AFromText, AToText: string): string;inline;
-Function AnsiMatchStr(const AText: string; const AValues: array of string): Boolean;inline;
+Function AnsiMatchStr(const AText: string; const AValues: array of string): Boolean;
 Function AnsiIndexStr(const AText: string; const AValues: array of string): Integer;
 
 { ---------------------------------------------------------------------
@@ -260,7 +260,7 @@ begin
 end;
 
 
-Function AnsiMatchText(const AText: string; const AValues: array of string): Boolean;inline;
+Function AnsiMatchText(const AText: string; const AValues: array of string): Boolean;
 begin
   Result:=(AnsiIndexText(AText,AValues)<>-1)
 end;
@@ -308,7 +308,7 @@ Result := StringReplace(AText,AFromText,AToText,[rfReplaceAll]);
 end;
 
 
-Function AnsiMatchStr(const AText: string; const AValues: array of string): Boolean;inline;
+Function AnsiMatchStr(const AText: string; const AValues: array of string): Boolean;
 begin
   Result:=AnsiIndexStr(AText,Avalues)<>-1;
 end;

+ 1 - 1
rtl/objpas/sysutils/dati.inc

@@ -758,7 +758,7 @@ begin
   else
     begin
     Result:=(s shr 1) or (m shl 5) or (h shl 11);
-    Result:=Result or DD shl 16 or (MM shl 21) or ((YY-1980) shl 25);
+    Result:=Result or longint(DD shl 16 or (MM shl 21) or (word(YY-1980) shl 25));
     end;
 {$else unix}
   Result:=LocalToEpoch(yy,mm,dd,h,m,s);

+ 1 - 1
rtl/win/dos.pp

@@ -536,7 +536,7 @@ function GetShortPathName(lpszLongPath:pchar; lpszShortPath:pchar; cchBuffer:DWO
 
 Function FSearch(path: pathstr; dirlist: string): pathstr;
 var
-  i,p1   : longint;
+  p1     : longint;
   s      : searchrec;
   newdir : pathstr;
 begin

+ 2 - 2
rtl/win/keyboard.pp

@@ -750,7 +750,7 @@ begin
        else
          b := DosTT[t.wVirtualScanCode].n;
        if b <> 0 then
-         key := (key and $FFFF00FF) or (longint (b) shl 8);
+         key := (key and $FFFF00FF) or (cardinal (b) shl 8);
      end;
 
      {Alt-0 to Alt-9}
@@ -770,7 +770,7 @@ begin
          else
            b := DosTT09[t.wVirtualScanCode].n;
          if b <> 0 then
-           key := (key and $FFFF0000) or (longint (b) shl 8);
+           key := (key and $FFFF0000) or (cardinal (b) shl 8);
        end;
 
      TranslateKey := key;

+ 2 - 2
rtl/wince/dos.pp

@@ -114,8 +114,8 @@ begin
   res:=FileTimeToLocalFileTime(@WTime, @lft) and FileTimeToSystemTime(@lft, @st);
   if res then
   begin
-    FatDate:=st.wDay or (st.wMonth shl 5) or ((st.wYear - 1980) shl 9);
-    FatTime:=(st.wSecond div 2) or (st.wMinute shl 5) or (st.wHour shl 11);
+    FatDate:=st.wDay or (st.wMonth shl 5) or (word(st.wYear - 1980) shl 9);
+    FatTime:=word(st.wSecond div 2) or (st.wMinute shl 5) or (st.wHour shl 11);
     Longrec(Dtime).Hi:=FatDate;
     Longrec(Dtime).Lo:=FatTime;
   end;