xserver: Branch 'master' - 2 commits

[Benjamin Close]

 Xext/panoramiX.h |    3 +--
 dix/dispatch.c   |    4 ----
 dix/dixfonts.c   |    4 ----
 3 files changed, 1 insertion(+), 10 deletions(-)

New commits:
commit a38ca0063c91ef221f20bf0c4ac0dc84ce07d557
Author: Benjamin Close <Benjamin.Close at clearchain.com>
Date:   Fri Feb 13 14:44:53 2009 +1030

    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>

diff --git a/Xext/panoramiX.h b/Xext/panoramiX.h
index 700c5a4..d413ff9 100644
--- a/Xext/panoramiX.h
+++ b/Xext/panoramiX.h
@@ -41,9 +41,8 @@ Equipment Corporation.
 #define _PANORAMIX_H_
 
 #define _PANORAMIX_SERVER
-#include <X11/extensions/panoramiXext.h>
+#include <X11/extensions/panoramiXproto.h>
 #undef _PANORAMIX_SERVER
-
 #include "gcstruct.h"
 
 
commit d62c085f36892c327785e85571bd2c7c70513ac6
Author: Benjamin Close <Benjamin.Close at clearchain.com>
Date:   Fri Feb 13 14:44:09 2009 +1030

    dix: Remove includes which are not actually used directly
    
    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>

diff --git a/dix/dispatch.c b/dix/dispatch.c
index b06f4aa..817aa17 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -130,10 +130,6 @@ int ProcInitialConnection();
 #include "dispatch.h"
 #include "swaprep.h"
 #include "swapreq.h"
-#ifdef PANORAMIX
-#include "panoramiX.h"
-#include "panoramiXsrv.h"
-#endif
 #include "privates.h"
 #include "xace.h"
 #include "inputstr.h"
diff --git a/dix/dixfonts.c b/dix/dixfonts.c
index 9f596e8..7d80781 100644
--- a/dix/dixfonts.c
+++ b/dix/dixfonts.c
@@ -70,10 +70,6 @@ Equipment Corporation.
 #include	<stdio.h>
 #endif
 
-#ifdef PANORAMIX
-#include "panoramiX.h"
-#endif
-
 #ifdef XF86BIGFONT
 #define _XF86BIGFONT_SERVER_
 #include <X11/extensions/xf86bigfont.h>