diff options
| -rw-r--r-- | winsup/cygwin/ChangeLog | 6 | ||||
| -rw-r--r-- | winsup/cygwin/include/sys/wait.h | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index ce8eefed3..b16708e44 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,8 +1,12 @@ 2011-12-08 Christopher Faylor <me.cygwin2011@cgf.cx> + * include/sys/wait.h: Add in all c++ functions. + +2011-12-08 Christopher Faylor <me.cygwin2011@cgf.cx> + * select.cc (select_stuff::wait): Temporarily disallow APCS. -2011-12-08 Christopher Faylor Christian Franke <franke@computer.org> +2011-12-08 Christopher Faylor <me.cygwin2011@cgf.cx> * include/sys/wait.h: Ensure that C++ functions are only used when using C++. diff --git a/winsup/cygwin/include/sys/wait.h b/winsup/cygwin/include/sys/wait.h index e7d16095e..71ede9376 100644 --- a/winsup/cygwin/include/sys/wait.h +++ b/winsup/cygwin/include/sys/wait.h @@ -77,7 +77,6 @@ inline int __wait_status_to_int (int __status) { return __status; } inline int __wait_status_to_int (const union wait & __status) { return __status.w_status; } -}; /* C++ wait() variants for `union wait'. */ inline pid_t wait (union wait *__status) @@ -88,6 +87,7 @@ inline pid_t wait3 (union wait *__status, int __options, struct rusage *__rusage { return wait3 ((int *) __status, __options, __rusage); } inline pid_t wait4 (pid_t __pid, union wait *__status, int __options, struct rusage *__rusage) { return wait4 (__pid, (int *) __status, __options, __rusage); } +}; #else /* !__cplusplus */ |