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

[Jeremy Huddleston]

 Xext/security.c          |    2 +-
 configure.ac             |    2 +-
 hw/xquartz/GL/indirect.c |    8 --------
 mi/miinitext.c           |    2 +-
 4 files changed, 3 insertions(+), 11 deletions(-)

New commits:
commit 7dcb9b1bac6a3394119619df3f54f14069f964bd
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Mon Aug 31 15:58:08 2009 -0700

    mi: fix build error caused by missing xtest.h
    
    xtest.h was renamed to xtestconst.h in xextproto.
    Requires xextproto 7.0.99.3
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    (cherry picked from commit 20daa145c437c3ba67970146f6182849f87a1b43)

diff --git a/configure.ac b/configure.ac
index b6f6fba..f362166 100644
--- a/configure.ac
+++ b/configure.ac
@@ -672,7 +672,7 @@ XEXT_LIB='$(top_builddir)/Xext/libXext.la'
 XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la'
 
 dnl Core modules for most extensions, et al.
-REQUIRED_MODULES="[randrproto >= 1.2.99.1] [renderproto >= 0.9.3] [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto [xextproto >= 7.0.99.1] [xproto >= 7.0.13] [xtrans >= 1.2.2] bigreqsproto resourceproto fontsproto [inputproto >= 1.5] [kbproto >= 1.0.3]"
+REQUIRED_MODULES="[randrproto >= 1.2.99.1] [renderproto >= 0.9.3] [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto [xextproto >= 7.0.99.3] [xproto >= 7.0.13] [xtrans >= 1.2.2] bigreqsproto resourceproto fontsproto [inputproto >= 1.5] [kbproto >= 1.0.3]"
 REQUIRED_LIBS="xfont xau fontenc [pixman-1 >= 0.13.2]"
 
 dnl HAVE_DBUS is true if we actually have the D-Bus library, whereas
diff --git a/mi/miinitext.c b/mi/miinitext.c
index 5fdc07a..67b354e 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -163,7 +163,7 @@ typedef void (*InitExtension)(INITARGS);
 #include <X11/extensions/shm.h>
 #endif
 #ifdef XTEST
-#include <X11/extensions/xtest.h>
+#include <X11/extensions/xtestconst.h>
 #endif
 #ifdef XKB
 #include <X11/extensions/XKB.h>
commit 1e642f22fbf029bb3917091cb5fa2f78b4a92f62
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Mon Aug 31 15:53:58 2009 -0700

    XQuartz: GLX: Drawable does not contain resize anymore.

diff --git a/hw/xquartz/GL/indirect.c b/hw/xquartz/GL/indirect.c
index f9d69f7..1762825 100644
--- a/hw/xquartz/GL/indirect.c
+++ b/hw/xquartz/GL/indirect.c
@@ -471,13 +471,6 @@ static int __glXAquaContextForceCurrent(__GLXcontext *baseContext)
 }
 
 /* Drawing surface notification callbacks */
-
-static GLboolean __glXAquaDrawableResize(__GLXdrawable *base)  {
-    // Don't remove, <rdar://problem/7114913>
-    GLAQUA_DEBUG_MSG("unimplemented glAquaDrawableResize\n");
-    return GL_TRUE;
-}
-
 static GLboolean __glXAquaDrawableSwapBuffers(__GLXdrawable *base) {
     CGLError err;
     __GLXAquaDrawable *drawable;
@@ -664,7 +657,6 @@ __glXAquaScreenCreateDrawable(__GLXscreen *screen,
   }
 
   glxPriv->base.destroy       = __glXAquaDrawableDestroy;
-  glxPriv->base.resize        = __glXAquaDrawableResize;
   glxPriv->base.swapBuffers   = __glXAquaDrawableSwapBuffers;
   glxPriv->base.copySubBuffer = NULL; /* __glXAquaDrawableCopySubBuffer; */
 
commit 9466e30e4521b46475ca2cd4cb0b29bc862a1c05
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 1a90a82..3daedac 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 */