xf86-video-intel: src/common.h uxa/uxa-priv.h

[Alan Coopersmith]

 src/common.h   |    2 +-
 uxa/uxa-priv.h |   10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit b8ca146b060e6f76bf048f1f6cf6ee89d38d015e
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Fri Apr 24 16:03:27 2009 -0700

    Fix UXA to build with Sun compilers (use __func__ instead of __FUNCTION__)
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at sun.com>

diff --git a/src/common.h b/src/common.h
index d27d484..99b4645 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 d1cd341..3b3a350 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