diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-09-05 14:54:26 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-09-05 14:54:26 (GMT) |
| commit | 21113a4394193d8f0da6497e2fc016929551f5cc (patch) | |
| tree | 64f95fb6a26926f8b326e5b2f348598408223b9f /generic/tclProcess.c | |
| parent | ba417d3ce6d273a724c772efed9f3fbca65b94a8 (diff) | |
| parent | 1f6ac7f87e3a127645d7839916f0bc2a6143b9b9 (diff) | |
| download | tcl-21113a4394193d8f0da6497e2fc016929551f5cc.zip tcl-21113a4394193d8f0da6497e2fc016929551f5cc.tar.gz tcl-21113a4394193d8f0da6497e2fc016929551f5cc.tar.bz2 | |
Merge trunk. Also rename TCL_NO_LENGTH -> TCL_AUTO_LENGTH
Diffstat (limited to 'generic/tclProcess.c')
| -rw-r--r-- | generic/tclProcess.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/generic/tclProcess.c b/generic/tclProcess.c index 799d0d4..ef16f4f 100644 --- a/generic/tclProcess.c +++ b/generic/tclProcess.c @@ -47,7 +47,7 @@ static void InitProcessInfo(ProcessInfo *info, Tcl_Pid pid, int resolvedPid); static void FreeProcessInfo(ProcessInfo *info); static int RefreshProcessInfo(ProcessInfo *info, int options); -static TclProcessWaitStatus WaitProcessStatus(Tcl_Pid pid, int resolvedPid, +static TclProcessWaitStatus WaitProcessStatus(Tcl_Pid pid, size_t resolvedPid, int options, int *codePtr, Tcl_Obj **msgPtr, Tcl_Obj **errorObjPtr); static Tcl_Obj * BuildProcessStatusObj(ProcessInfo *info); @@ -193,7 +193,7 @@ RefreshProcessInfo( TclProcessWaitStatus WaitProcessStatus( Tcl_Pid pid, /* Process id. */ - int resolvedPid, /* Resolved process id. */ + size_t resolvedPid, /* Resolved process id. */ int options, /* Options passed to Tcl_WaitPid. */ int *codePtr, /* If non-NULL, will receive either: * - 0 for normal exit. @@ -799,7 +799,7 @@ void TclProcessCreated( Tcl_Pid pid) /* Process id. */ { - int resolvedPid; + size_t resolvedPid; Tcl_HashEntry *entry, *entry2; int isNew; ProcessInfo *info; |