Mercurial > octave
diff libinterp/corefcn/pager.cc @ 21921:ecfcc8527661
hide sys/wait.h header and provide wrappers for waitpid macros
* bootstrap.conf: Use sys_wait and waitpid gnulib modules.
* liboctave/wrappers/wait-wrappers.c, added
liboctave/wrappers/wait-wrappers.h: New files.
* changed liboctave/wrappers/module.mk: Update.
* liboctave/system/syswait.h: Delete.
* liboctave/system/module.mk: Update.
* oct-syscalls.cc, oct-syscalls.h (wcontinue, wcoredump, wifcontinued,
wifexited, wifsignaled, wifstopped, wexitstatus, wnohang, wstopsig,
wtermsig, wuntraced): New functions.
(waitpid): Use octave_waitpid_wrapper.
* lo-cutils.c, lo-cutils.h (octave_waitpid, octave_wifexited,
octave_wexitstatus, octave_wifsignaled, octave_wtermsig,
octave_wcoredump, octave_wifstopped, octave_wstopsig,
octave_wifcontinued): Delete.
* lo-utils.h (class octave_wait): Delete.
* octave-gui.cc, help.cc: Don't include sys/wait.h.
* pager.cc, sighandlers.cc, syscalls.cc, toplev.cc:
Use wait functions from octave::sys namespace.
* main.in.cc: Use wait-wrappers.h.
* src/module.mk: Update.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 16 Jun 2016 01:00:20 -0400 |
parents | 176536b15d68 |
children | 112b20240c87 |
line wrap: on
line diff
--- a/libinterp/corefcn/pager.cc Wed Jun 15 16:41:02 2016 -0400 +++ b/libinterp/corefcn/pager.cc Thu Jun 16 01:00:20 2016 -0400 @@ -30,6 +30,7 @@ #include "cmd-edit.h" #include "oct-env.h" +#include "oct-syscalls.h" #include "singleton-cleanup.h" #include "defaults.h" @@ -108,7 +109,7 @@ if (pid > 0) { - if (octave_wait::ifexited (status) || octave_wait::ifsignaled (status)) + if (octave::sys::wifexited (status) || octave::sys::wifsignaled (status)) { // Avoid warning() since that will put us back in the pager, // which would be bad news.