xserver: Branch 'xorg-server-1.5-apple' - 3 commits

[Jeremy Huddleston]

 Xext/xevie.c |    2 ++
 dix/window.c |    1 +
 fb/fbarc.c   |    4 +++-
 3 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit b030eb0ce67ffb96a1ee80558a782101ae1dd2ab
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Sat Nov 22 14:39:37 2008 -0800

    Xevie: Shutup gcc from warning about no previous prototype...

diff --git a/Xext/xevie.c b/Xext/xevie.c
index 1d51fd8..f401244 100644
--- a/Xext/xevie.c
+++ b/Xext/xevie.c
@@ -126,6 +126,8 @@ static void XeviePointerProcessInputProc(xEvent *xE, DeviceIntPtr dev,
                                          int count);
 static void XevieKbdProcessInputProc(xEvent *xE, DeviceIntPtr dev, int count);
 
+/* Shutup gcc about no previous prototype */
+void XevieExtensionInit(void);
 void
 XevieExtensionInit (void)
 {
commit d4a46fc3e6bb087bcd65c6934bb4180ca5794410
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Sat Nov 22 14:33:01 2008 -0800

    fb: Removed a warning about unused variable

diff --git a/fb/fbarc.c b/fb/fbarc.c
index f89b81c..97f614d 100644
--- a/fb/fbarc.c
+++ b/fb/fbarc.c
@@ -71,8 +71,10 @@ fbPolyArc (DrawablePtr	pDrawable,
 	    BoxRec	box;
 	    int		x2, y2;
 	    RegionPtr	cclip;
+#ifdef FB_ACCESS_WRAPPER
 	    int		wrapped = 0;
-	    
+#endif
+
 	    cclip = fbGetCompositeClip (pGC);
 	    fbGetDrawable (pDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff);
 #ifdef FB_ACCESS_WRAPPER
commit d0f00dd2f97f09a83a2ab89bd7a41bf3d4cf3470
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Sat Nov 22 14:30:36 2008 -0800

    dix: Added missing include for miPaintWindow

diff --git a/dix/window.c b/dix/window.c
index f3c3af2..af48a0b 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -122,6 +122,7 @@ Equipment Corporation.
 #endif
 #include "dixevents.h"
 #include "globals.h"
+#include "mi.h"
 
 #ifdef XAPPGROUP
 #include "appgroup.h"