xserver: Branch 'master'

[Alan Coopersmith]

 hw/xfree86/common/compiler.h   |    5 +++++
 hw/xfree86/common/xf86Xinput.c |    1 +
 2 files changed, 6 insertions(+)

New commits:
commit b015a021b28623b7b734833dc9b8269c41db4e8a
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Tue Oct 21 20:30:35 2008 -0700

    Allow non-gcc compilers to build xf86Xinput.c

diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
index 886c639..f55219b 100644
--- a/hw/xfree86/common/compiler.h
+++ b/hw/xfree86/common/compiler.h
@@ -75,6 +75,11 @@
 #  endif
 # endif /* __inline */
 
+/* Support gcc's __FUNCTION__ for people using other compilers */
+#if !defined(__GNUC__) && !defined(__FUNCTION__)
+# define __FUNCTION__ __func__ /* C99 */
+#endif
+
 # if defined(NO_INLINE) || defined(DO_PROTOTYPES)
 
 #  if !defined(__arm__)
diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index 8eaa118..d404048 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -61,6 +61,7 @@
 #include "xf86Optrec.h"
 #include "mipointer.h"
 #include "xf86InPriv.h"
+#include "compiler.h"
 
 #ifdef DPMSExtension
 #define DPMS_SERVER