diff options
author | marco <marco@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2017-09-03 14:42:55 +0000 |
---|---|---|
committer | marco <marco@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2017-09-03 14:42:55 +0000 |
commit | 876c961c707c8d32640c8e4fa23ed96d004fb22f (patch) | |
tree | 322e5f8f3c4b9263ad954713eb3fcb68a266ba79 | |
parent | aeb89454c12adb94766960d57270f99e6eba6edc (diff) | |
download | fpc-876c961c707c8d32640c8e4fa23ed96d004fb22f.tar.gz |
--- Merging r36858 into '.':
U rtl/unix/oscdeclh.inc
--- Recording mergeinfo for merge of r36858 into '.':
U .
# revisions: 36858
git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@37122 3ad0048d-3df7-0310-abae-a5850022a9f2
-rw-r--r-- | rtl/unix/oscdeclh.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rtl/unix/oscdeclh.inc b/rtl/unix/oscdeclh.inc index bde5200517..6fb0f8b3af 100644 --- a/rtl/unix/oscdeclh.inc +++ b/rtl/unix/oscdeclh.inc @@ -83,7 +83,7 @@ const function FpExecve (path : pchar; argv : ppchar; envp: ppchar): cint; cdecl; external clib name 'execve'; function FpExecv (path : pchar; argv : ppchar): cint; cdecl; external clib name 'execv'; function FpWaitpid (pid : TPid; stat_loc : pcint; options: cint): TPid; cdecl; external clib name 'waitpid'; - Function FpWait (var stat_loc : cInt): TPid; cdecl; external clib name 'waitpid'; + Function FpWait (var stat_loc : cInt): TPid; cdecl; external clib name 'wait'; procedure FpExit (status : cint); cdecl; external clib name '_exit'; Function FpKill (pid : TPid; sig: cInt): cInt; cdecl; external clib name 'kill'; function FpUname (var name: utsname): cint; cdecl; external clib name 'uname'; |