diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-04-24 16:03:27 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-04-24 16:04:13 -0700 |
| commit | b8ca146b060e6f76bf048f1f6cf6ee89d38d015e (patch) | |
| tree | 9bf69116b4d503e01d45381ad2e4cfa1a824e30d | |
| parent | 5d6f4f6eb7a4dcbe1ce5a134d882e56f958ed2ba (diff) | |
Fix UXA to build with Sun compilers (use __func__ instead of __FUNCTION__)
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
| -rw-r--r-- | src/common.h | 2 | ||||
| -rw-r--r-- | uxa/uxa-priv.h | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/common.h b/src/common.h index d27d4849..99b46456 100644 --- a/src/common.h +++ b/src/common.h @@ -40,7 +40,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define _INTEL_COMMON_H_ /* Provide substitutes for gcc's __FUNCTION__ on other compilers */ -#ifndef __GNUC__ +#if !defined(__GNUC__) && !defined(__FUNCTION__) # if defined(__STDC__) && (__STDC_VERSION__>=199901L) /* C99 */ # define __FUNCTION__ __func__ # else diff --git a/uxa/uxa-priv.h b/uxa/uxa-priv.h index d1cd341e..3b3a3501 100644 --- a/uxa/uxa-priv.h +++ b/uxa/uxa-priv.h @@ -64,6 +64,16 @@ #endif #include "damage.h" +/* Provide substitutes for gcc's __FUNCTION__ on other compilers */ +#if !defined(__GNUC__) && !defined(__FUNCTION__) +# if defined(__STDC__) && (__STDC_VERSION__>=199901L) /* C99 */ +# define __FUNCTION__ __func__ +# else +# define __FUNCTION__ "" +# endif +#endif + + /* 1.6 and earlier server compat */ #ifndef miGetCompositeClip #define miCopyRegion fbCopyRegion |