From 263acfa61391e4a483acb37db92976f81cc3ae37 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Thu, 8 Dec 2011 06:58:10 +0000 Subject: [PATCH] * include/sys/wait.h: Ensure that C++ functions are only used when using C++. --- winsup/cygwin/ChangeLog | 5 +++++ winsup/cygwin/include/sys/wait.h | 2 ++ 2 files changed, 7 insertions(+) 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 + + * include/sys/wait.h: Ensure that C++ functions are only used when + using C++. + 2011-12-08 Christopher Faylor * 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)