JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* include/sys/wait.h: Remove C++ inline functions for `union wait'. For C++

Browse Source 
use `void *' as __wait_status_ptr_t instead.  This is less type safe but fixes
compile error on `wait(NULL)'.  Remove extra `;'.
This commit is contained in:
Christopher Faylor
2012-02-08 19:51:13 +00:00
parent bb2b641c13
commit 30c66cea49
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/cygwin/ChangeLog
View File

@@ -1,3 +1,9 @@
2012-02-08 Christian Franke <franke@computer.org>
* include/sys/wait.h: Remove C++ inline functions for `union wait'.
For C++ use `void *' as __wait_status_ptr_t instead. This is less type
safe but fixes compile error on `wait(NULL)'. Remove extra `;'.
2012-02-08 Corinna Vinschen <corinna@vinschen.de> 2012-02-08 Corinna Vinschen <corinna@vinschen.de>
* sigproc.cc (child_info_fork::abort): Call TerminateProcess rather * sigproc.cc (child_info_fork::abort): Call TerminateProcess rather

24
winsup/cygwin/include/sys/wait.h
View File

@@ -19,11 +19,16 @@ details. */
extern "C" { extern "C" {
#endif #endif
#ifdef __cplusplus #ifdef __INSIDE_CYGWIN__
typedef int *__wait_status_ptr_t; typedef int *__wait_status_ptr_t;
#else /* !__cplusplus */ #elif defined(__cplusplus)
/* Attribute __transparent_union__ is only supported for C. */
typedef void *__wait_status_ptr_t;
#else /* !__INSIDE_CYGWIN__ && !__cplusplus */
/* Allow `int' and `union wait' for the status. */ /* Allow `int' and `union wait' for the status. */
typedef union typedef union
@@ -32,7 +37,7 @@ typedef union
union wait *__union_wait_ptr; union wait *__union_wait_ptr;
} __wait_status_ptr_t __attribute__ ((__transparent_union__)); } __wait_status_ptr_t __attribute__ ((__transparent_union__));
#endif /* __cplusplus */ #endif /* __INSIDE_CYGWIN__ */
pid_t wait (__wait_status_ptr_t __status); pid_t wait (__wait_status_ptr_t __status);
pid_t waitpid (pid_t __pid, __wait_status_ptr_t __status, int __options); pid_t waitpid (pid_t __pid, __wait_status_ptr_t __status, int __options);
@@ -56,7 +61,6 @@ union wait
unsigned int:16; unsigned int:16;
} __wait_stopped; } __wait_stopped;
}; };
#define w_termsig __wait_terminated.__w_termsig #define w_termsig __wait_terminated.__w_termsig
#define w_coredump __wait_terminated.__w_coredump #define w_coredump __wait_terminated.__w_coredump
#define w_retcode __wait_terminated.__w_retcode #define w_retcode __wait_terminated.__w_retcode
@@ -77,17 +81,7 @@ inline int __wait_status_to_int (int __status)
{ return __status; } { return __status; }
inline int __wait_status_to_int (const union wait & __status) inline int __wait_status_to_int (const union wait & __status)
{ return __status.w_status; } { return __status.w_status; }
}
/* C++ wait() variants for `union wait'. */
inline pid_t wait (union wait *__status)
{ return wait ((int *) __status); }
inline pid_t waitpid (pid_t __pid, union wait *__status, int __options)
{ return waitpid(__pid, (int *) __status, __options); }
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 */ #else /* !__cplusplus */