浏览代码

* Ptrint considered harmfull bug no 54689826, change to ptruint.

git-svn-id: trunk@6961 -
daniel 18 年之前
父节点
当前提交
5da5440e12
共有 2 个文件被更改,包括 4 次插入4 次删除
  1. 3 3
      rtl/linux/ossysc.inc
  2. 1 1
      rtl/unix/oscdeclh.inc

+ 3 - 3
rtl/linux/ossysc.inc

@@ -179,7 +179,7 @@ begin
         dirp^.dd_size := bytes;
         dirp^.dd_nextoff := 0;
       end;
-    dp := pdirent(ptrint(dirp^.dd_buf)+dirp^.dd_nextoff);
+    dp := Pdirent(ptruint(dirp^.dd_buf)+dirp^.dd_nextoff);
     inc(dirp^.dd_nextoff,dp^.d_reclen);
     inc(dirp^.dd_loc,dp^.d_reclen);
   until dp^.d_fileno <> 0; // Don't show deleted files
@@ -271,7 +271,7 @@ function Fpsigaction(sig: cint; new_action, old_action: psigactionrec): cint; [p
 begin
 {$ifdef cpusparc}
   { Sparc has an extra stub parameter }
-  Fpsigaction:=do_syscall(syscall_nr_rt_sigaction,TSysParam(sig),TSysParam(new_action),TSysParam(old_action),TSysParam(PtrInt(@Fprt_sigreturn_stub)-8),TSysParam(8));
+  Fpsigaction:=do_syscall(syscall_nr_rt_sigaction,TSysParam(sig),TSysParam(new_action),TSysParam(old_action),TSysParam(ptruint(@Fprt_sigreturn_stub)-8),TSysParam(8));
 {$else cpusparc}
 {$ifdef NEED_USER_TRAMPOLINE}
   if new_action <> nil then
@@ -582,7 +582,7 @@ end;
 
 {$if defined(cpupowerpc)}
 { fpprctl() call }
-function fpprctl(option : cint; const arg : ptrint) : cint;
+function fpprctl(option : cint; const arg : ptruint) : cint;
 begin
   fpprctl := do_syscall(syscall_nr_prctl, option, arg);
 end;

+ 1 - 1
rtl/unix/oscdeclh.inc

@@ -133,5 +133,5 @@ const
     function  FpWriteV	   (fd: cint; const iov : piovec; iovcnt : cint):TSSize;  cdecl; external clib name 'writev';
 
 {$ifdef linux}
-    function  FpPrCtl(options : cInt; const args : ptrint) : cint; cdecl; external clib name 'prctl';
+    function  FpPrCtl(options : cInt; const args : ptruint) : cint; cdecl; external clib name 'prctl';
 {$endif}