diff options
| author | Ilya Zakharevich <ilya@math.ohio-state.edu> | 1997-06-09 16:52:06 +1200 |
|---|---|---|
| committer | Tim Bunce <Tim.Bunce@ig.co.uk> | 1997-08-07 00:00:00 +1200 |
| commit | 367f3c247e808d76465803ec861b19fd55ffd90d (patch) | |
| tree | 4ca58250b62dedd5b9ff9bae8d8a993b3debb769 /util.c | |
| parent | 17fd57d4d5d145d80aa9549b4fb89625b31a4148 (diff) | |
| download | perl-367f3c247e808d76465803ec861b19fd55ffd90d.tar.gz | |
Assorted OS/2 fixes
In article <9706131709.AA05526@toad.ig.co.uk>,
Tim Bunce <Tim.Bunce@ig.co.uk> wrote:
> It give me great pleasure to announce the arrival of perl5.004_01.
Thank you for a great job! You even corrected os2/diff.configure!
Unfortunately, several sections of os2/diff.configure were erroneously
removed, so it will not create a valid config.sh any more (ar used
instead of $ar, and one extra method to extract symbols is not
tried). Unfortunately, I was away from my development machine, so
could not try it earlier.
A patch to correct this problem, and some other ones, follows.
a) Missing sections restored;
os2/diff.configure
b) my_flock added to os2/os2.c (libc contains a dummy
implementation only) (switchable off in case CRT DLL
is fixed in this respect);
os2/os2ish.h os2/Makefile.SHs os2/os2.c
c) depending on architecture, waitpid may be implemented or not.
New define HAS_WAITPID_RUNTIME is added and wait4pid
corrected correspondingly;
os2/os2ish.h util.c
d) if -S was given and the file name contained \ , it was
nevertheless searched on path;
perl.c
e) updated:
os2/Changes README.os2
f) by default use better gcc optimization options (as mbeattie
advices):
hints/os2.sh
[editor's note: this was applied in the reverse order to one a couple
of commits ago]
p5p-msgid: 1997Jun16.163234.2091727@hmivax.humgen.upenn.edu
Diffstat (limited to 'util.c')
| -rw-r--r-- | util.c | 13 |
1 files changed, 9 insertions, 4 deletions
@@ -2087,11 +2087,17 @@ int flags; } } #ifdef HAS_WAITPID +# ifdef HAS_WAITPID_RUNTIME + if (!HAS_WAITPID_RUNTIME) + goto hard_way; +# endif return waitpid(pid,statusp,flags); -#else -#ifdef HAS_WAIT4 +#endif +#if !defined(HAS_WAITPID) && defined(HAS_WAIT4) return wait4((pid==-1)?0:pid,statusp,flags,Null(struct rusage *)); -#else +#endif +#if !defined(HAS_WAITPID) && !defined(HAS_WAIT4) || defined(HAS_WAITPID_RUNTIME) + hard_way: { I32 result; if (flags) @@ -2105,7 +2111,6 @@ int flags; return result; } #endif -#endif } #endif /* !DOSISH */ |