diff options
author | marha <marha@users.sourceforge.net> | 2010-10-05 10:44:08 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-10-05 10:44:08 +0000 |
commit | bfa0c2fa423efa7ece6e54d5f30bbe95ca4bfc2a (patch) | |
tree | 37c4a2982fb317254b1ea14dd06c355f9da7826a /X11/Xfuncproto.h.in | |
parent | fe234aa555e2b16ac7836fee297878a6e3efe343 (diff) | |
parent | 51f3d1e140307561f64c47dae1d44f912accb5cf (diff) | |
download | vcxsrv-bfa0c2fa423efa7ece6e54d5f30bbe95ca4bfc2a.tar.gz vcxsrv-bfa0c2fa423efa7ece6e54d5f30bbe95ca4bfc2a.tar.bz2 vcxsrv-bfa0c2fa423efa7ece6e54d5f30bbe95ca4bfc2a.zip |
svn merge ^/branches/released .
Diffstat (limited to 'X11/Xfuncproto.h.in')
-rw-r--r-- | X11/Xfuncproto.h.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/X11/Xfuncproto.h.in b/X11/Xfuncproto.h.in index 96a585ce8..017711912 100644 --- a/X11/Xfuncproto.h.in +++ b/X11/Xfuncproto.h.in @@ -117,7 +117,8 @@ in this Software without prior written authorization from The Open Group. # define _X_DEPRECATED #endif -#if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 205) +#if (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 205)) \ + || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)) # define _X_NORETURN __attribute((noreturn)) #else # define _X_NORETURN |