xserver: Branch 'server-1.6-branch'

[Ian Romanick]

 Xext/panoramiX.h |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 34724f45512e311377b972da480d35304fd687cc
Author: Paulo Cesar Pereira de Andrade <pcpa at mandriva.com.br>
Date:   Fri Jan 30 03:56:39 2009 -0200

    Work around inclusion of <X11/extensions/panoramiXext.h>
    
      The X Server build only needs the macros PANORAMIX_MAJOR_VERSION
    and PANORAMIX_MINOR_VERSION from that header.
      Addition of extra prototypes to <X11/extensions/panoramiXext.h>
    caused a X Server build failure.

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