xserver: Branch 'xorg-server-1.6-apple'

[Jeremy Huddleston]

 Xext/panoramiX.h |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit f6b0dd98e6e86d933a85f633fd66ce3c81cc768a
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>
    (cherry picked from commit a38ca0063c91ef221f20bf0c4ac0dc84ce07d557)

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"