Don't use transparent unions in C++.

[kopensolaris-gnu/glibc.git] / posix / sys / wait.h

diff --git a/posix/sys/wait.h b/posix/sys/wait.h
index 9b5025a..e931405 100644 (file)
--- a/posix/sys/wait.h
+++ b/posix/sys/wait.h
@@ -38,7 +38,7 @@ __BEGIN_DECLS
 /* Lots of hair to allow traditional BSD use of `union wait'
    as well as POSIX.1 use of `int' for the status word.  */
 
-# ifdef        __GNUC__
+# if defined __GNUC__ && !defined __cplusplus
 #  define __WAIT_INT(status)                                                 \
   (__extension__ ({ union { __typeof(status) __in; int __i; } __u;           \
                    __u.__in = (status); __u.__i; }))
@@ -51,7 +51,7 @@ __BEGIN_DECLS
    allowed without complaint.  __WAIT_STATUS_DEFN is the type used in
    the actual function definitions.  */
 
-# if !defined __GNUC__ || __GNUC__ < 2
+# if !defined __GNUC__ || __GNUC__ < 2 || defined __cplusplus
 #  define __WAIT_STATUS                __ptr_t
 #  define __WAIT_STATUS_DEFN   __ptr_t
 # else
@@ -60,7 +60,7 @@ typedef union
   {
     union wait *__uptr;
     int *__iptr;
-  } __WAIT_STATUS __attribute__ ((transparent_union));
+  } __WAIT_STATUS __attribute__ ((__transparent_union__));
 # define __WAIT_STATUS_DEFN    int *
 #endif