diff options
| author | Christopher Faylor <me@cgf.cx> | 2011-12-08 06:58:10 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2011-12-08 06:58:10 +0000 |
| commit | 263acfa61391e4a483acb37db92976f81cc3ae37 (patch) | |
| tree | 00e444ff0e1f563845ab831335ed90751af42673 | |
| parent | 986da7853d68e173d6f48f6a3cfe15df41ad084f (diff) | |
| download | cygnal-263acfa61391e4a483acb37db92976f81cc3ae37.tar.gz cygnal-263acfa61391e4a483acb37db92976f81cc3ae37.tar.bz2 cygnal-263acfa61391e4a483acb37db92976f81cc3ae37.zip | |
* include/sys/wait.h: Ensure that C++ functions are only used when using C++.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/cygwin/include/sys/wait.h | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 9ab00e78b..d832047ea 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +2011-12-08 Christopher Faylor Christian Franke <franke@computer.org> + + * include/sys/wait.h: Ensure that C++ functions are only used when + using C++. + 2011-12-08 Christopher Faylor <me.cygwin2011@cgf.cx> * select.cc (cygwin_select): Make sure that poll is called when diff --git a/winsup/cygwin/include/sys/wait.h b/winsup/cygwin/include/sys/wait.h index 4341f6970..e7d16095e 100644 --- a/winsup/cygwin/include/sys/wait.h +++ b/winsup/cygwin/include/sys/wait.h @@ -72,10 +72,12 @@ union wait #ifdef __cplusplus +extern "C++" { 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) |