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

[Jeremy Huddleston]

 Xext/panoramiX.h |    4 +++-
 Xext/security.c  |    2 +-
 Xext/xevie.c     |    3 +--
 3 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 5ae71e9c940941954116c11c726161f4fbb8c736
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Mon Aug 31 11:23:20 2009 -0700

    Use evieproto.h instead...

diff --git a/Xext/xevie.c b/Xext/xevie.c
index 1e08529..0b8295f 100644
--- a/Xext/xevie.c
+++ b/Xext/xevie.c
@@ -45,8 +45,7 @@ of the copyright holder.
 #include "colormapst.h"
 #include "scrnintstr.h"
 #include "servermd.h"
-#define  _XEVIE_SERVER_
-#include <X11/extensions/Xeviestr.h>
+#include <X11/extensions/evieproto.h>
 #include <X11/Xfuncproto.h>
 #include "input.h"
 #include "inputstr.h"
commit c40d988b238b7f685650e662859924b4a1dd227d
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Fri Jul 17 10:40:59 2009 +1000

    Xext: include securproto.h instead of securstr.h
    
    Reported-by: Byeong-ryeol Kim
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    (cherry picked from commit 4db8950b1dfc3150ee2e9f1f975e9ecb4eabb1f2)

diff --git a/Xext/security.c b/Xext/security.c
index 40a5753..916a2ed 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -37,7 +37,7 @@ in this Software without prior written authorization from The Open Group.
 #include "registry.h"
 #include "xacestr.h"
 #include "securitysrv.h"
-#include <X11/extensions/securstr.h>
+#include <X11/extensions/securproto.h>
 #include "modinit.h"
 
 /* Extension stuff */
commit fc792024f7bc8c9810de474760d1e9e827e79cdf
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Mon Aug 31 11:20:00 2009 -0700

    xext: Use proto header rather than the Xext include file, this prevents userspace being pulled in causing issues
    
    Signed-off-by: Benjamin Close <Benjamin.Close at clearchain.com>
    Acked-by: Peter Hutterer <peter.hutterer at who-t.net>
    Acked-by: Daniel Stone <daniel at fooishbar.org>
    (cherry picked from commit a38ca0063c91ef221f20bf0c4ac0dc84ce07d557)

diff --git a/Xext/panoramiX.h b/Xext/panoramiX.h
index 89c7547..d413ff9 100644
--- a/Xext/panoramiX.h
+++ b/Xext/panoramiX.h
@@ -40,7 +40,9 @@ Equipment Corporation.
 #ifndef _PANORAMIX_H_
 #define _PANORAMIX_H_
 
-#include <X11/extensions/panoramiXext.h>
+#define _PANORAMIX_SERVER
+#include <X11/extensions/panoramiXproto.h>
+#undef _PANORAMIX_SERVER
 #include "gcstruct.h"