* include/sys/wait.h: Ensure that C++ functions are only used when using C++.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 9ab00e7..d832047 100644 (file)
--- 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 4341f69..e7d1609 100644 (file)
--- 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)